summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/bcm47xx_wdt.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-09-05 06:41:35 +0200
committerOlof Johansson <olof@lixom.net>2012-09-05 06:41:35 +0200
commitf81a3a1f687a4a90025822dd54e51d7117a6cba7 (patch)
tree5871e5a0582bbe4161f469e4e73f6f75655e8cbd /drivers/watchdog/bcm47xx_wdt.c
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/r... (diff)
parentARM: shmobile: armadillo800eva: enable rw rootfs mount (diff)
downloadlinux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.xz
linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Two regression fixes and one boot-loader compatibility fix from Simon Horman. * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: armadillo800eva: enable rw rootfs mount ARM: shmobile: mackerel: fixup usb module order ARM: shmobile: armadillo800eva: fixup: sound card detection order
Diffstat (limited to 'drivers/watchdog/bcm47xx_wdt.c')
0 files changed, 0 insertions, 0 deletions