Linus Torvalds
68b86a2522
Merge git://www.linux-watchdog.org/linux-watchdog
...
Pull watchdog updates from Wim Van Sebroeck:
"This contains:
- fixes and improvements
- devicetree bindings
- conversion to watchdog generic framework of the following drivers:
- booke_wdt
- bcm47xx_wdt.c
- at91sam9_wdt
- Removal of old STMP3xxx driver
- Addition of following new drivers:
- new driver for STMP3xxx and i.MX23/28
- Retu watchdog driver"
* git://www.linux-watchdog.org/linux-watchdog: (30 commits)
watchdog: sp805_wdt depends on ARM
watchdog: davinci_wdt: update to devm_* API
watchdog: davinci_wdt: use devm managed clk get
watchdog: at91rm9200: add DT support
watchdog: add timeout-sec property binding
watchdog: at91sam9_wdt: Convert to use the watchdog framework
watchdog: omap_wdt: Add option nowayout
watchdog: core: dt: add support for the timeout-sec dt property
watchdog: bcm47xx_wdt.c: add hard timer
watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
watchdog: bcm47xx_wdt.c: rename ops methods
watchdog: bcm47xx_wdt.c: use platform device
watchdog: bcm47xx_wdt.c: convert to watchdog core api
watchdog: Convert BookE watchdog driver to watchdog infrastructure
watchdog: s3c2410_wdt: Use devm_* functions
watchdog: remove old STMP3xxx driver
watchdog: add new driver for STMP3xxx and i.MX23/28
rtc: stmp3xxx: add wdt-accessor function
watchdog: introduce retu_wdt driver
watchdog: intel_scu_watchdog: fix Kconfig dependency
...
2013-03-03 10:23:29 -08:00
..
alchemy
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ar7
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ath79
Merge git://www.linux-watchdog.org/linux-watchdog
2013-03-03 10:23:29 -08:00
bcm47xx
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
2013-02-22 10:07:30 +01:00
bcm63xx
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
boot
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
cavium-octeon
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
cobalt
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
configs
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
dec
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
emma
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
fw
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
include
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
jazz
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
jz4740
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
kernel
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2013-03-02 08:34:06 -08:00
lantiq
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
lasat
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
lib
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
loongson
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
loongson1
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
math-emu
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
mm
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
mti-malta
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
mti-sead3
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
netlogic
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
oprofile
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
pci
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
pmcs-msp71xx
MIPS: MSP71xx: Move code.
2013-02-01 10:00:22 +01:00
pnx833x
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
power
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
powertv
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
ralink
MIPS: ralink: add CPU interrupt controller to of_irq_ids
2013-02-17 01:25:34 +01:00
rb532
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sgi-ip22
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sgi-ip27
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
sgi-ip32
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sibyte
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
sni
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
txx9
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
vr41xx
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
wrppmc
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
Kbuild
Kbuild.platforms
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
2013-02-21 12:51:33 +01:00
Kconfig
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
Kconfig.debug
Makefile
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00