aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/masters/omap_hdq.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-11-08 16:41:37 -0800
committerOlof Johansson <olof@lixom.net>2014-11-08 16:41:37 -0800
commitfe9b86fb2620572e5e7eba1eab18a016dfd11197 (patch)
treec792c7a769ee9ed4122c3d48540ea67522ff20fa /drivers/w1/masters/omap_hdq.c
parentLinux 3.18-rc3 (diff)
parentreset: add the Berlin reset controller driver (diff)
downloadlinux-dev-fe9b86fb2620572e5e7eba1eab18a016dfd11197.tar.xz
linux-dev-fe9b86fb2620572e5e7eba1eab18a016dfd11197.zip
Merge tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/drivers
Merge "ARM: berlin: Driver changes for v3.19 (round 1)" from Sebastian Hesselbarth: Berlin Driver changes for v3.19 (round 1) - Reset driver, Acked by Philipp Zabel * tag 'berlin-driver-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin: reset: add the Berlin reset controller driver Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/w1/masters/omap_hdq.c')
0 files changed, 0 insertions, 0 deletions