summaryrefslogtreecommitdiff
path: root/drivers/watchdog/octeon-wdt-main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 23:44:25 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-11 23:44:25 +0400
commit887eafd29bce6e6e0b2df91d1d0da3331490fd5d (patch)
treeb65df7723a8745aaf4769f2f5df9d12adcc2beaa /drivers/watchdog/octeon-wdt-main.c
parent8daf4ded903a2e6e18d650861b354e43a3f8bf88 (diff)
parent9861e9551f443bb2e8dacd4b9572cb8dab0f3ad7 (diff)
downloadlinux-887eafd29bce6e6e0b2df91d1d0da3331490fd5d.tar.xz
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: - multiple omap2+ bug fixes - a regression on ux500 dt support - a build failure on shmobile * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: OMAP2+: omap2plus_defconfig: EHCI driver is not stable, disable it ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n ARM: ux500: Over-ride the DT device naming scheme for pinctrl ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set of: address: Don't fail a lookup just because a node has no reg property ARM: OMAP2+: hwmod code/clockdomain data: fix 32K sync timer
Diffstat (limited to 'drivers/watchdog/octeon-wdt-main.c')
0 files changed, 0 insertions, 0 deletions