Linus Torvalds 2313bcdcc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog ... * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog: (25 commits) watchdog: WatchDog Timer Driver Core - Add minimum and max timeout watchdog: WatchDog Timer Driver Core - Add ioctl call watchdog: WatchDog Timer Driver Core - Add nowayout feature watchdog: WatchDog Timer Driver Core - Add Magic Close feature watchdog: WatchDog Timer Driver Core - Add WDIOC_SETTIMEOUT and WDIOC_GETTIMEOUT ioctl watchdog: WatchDog Timer Driver Core - Add WDIOC_SETOPTIONS ioctl watchdog: WatchDog Timer Driver Core - Add WDIOC_KEEPALIVE ioctl watchdog: WatchDog Timer Driver Core - Add basic ioctl functionality watchdog: WatchDog Timer Driver Core - Add basic framework watchdog: hpwdt: add next gen HP servers watchdog: it8712f_wdt.c: improve includes watchdog: at91sam9/wdt: move register header to drivers watchdog: Add Xilinx watchdog timer driver watchdog: remove empty pm-functions watchdog: sp805: Flush posted writes in enable/disable. watchdog: sp805: Don't write 0 to the load value register. watchdog: imx2_wdt: add device tree probe support watchdog: s3c2410: Add support for device tree based probe watchdog: mpcore_wdt: Add suspend/resume support. watchdog: mtx1-wdt: use dev_{err,info} instead of printk() ...		2011-07-29 23:28:47 -07:00
..
arm	Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-26 17:09:31 -07:00
ata	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
crypto	dt: bindings: move SEC node under new crypto/	2011-07-07 13:51:19 -06:00
fb	Fix common misspellings	2011-03-31 11:26:23 -03:00
gpio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-07-27 09:24:56 -07:00
hwmon	hwmon: (ads1015) Make gain and datarate configurable	2011-03-21 17:59:37 +01:00
i2c	x86: dtb: Add a device tree for CE4100	2011-02-23 22:27:52 +01:00
mmc	Merge commit 'v2.6.38-rc8' into spi/next	2011-03-12 01:25:53 -07:00
mtd	Fix common misspellings	2011-03-31 11:26:23 -03:00
net	doc: powerpc: drop +x perms on text file	2011-06-27 16:39:34 +02:00
pci	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
powerpc	dt: bindings: move SEC node under new crypto/	2011-07-07 13:51:19 -06:00
rtc	x86, olpc: Add XO-1 RTC driver	2011-07-06 14:44:42 -07:00
serial	tty: serial: altera_jtaguart: Add device tree support	2011-03-01 09:38:27 -07:00
serio	altera_ps2: Add devicetree support	2011-02-15 21:39:21 -07:00
spi	spi/imx: add device tree probe support	2011-07-14 13:47:18 -06:00
tty/serial	tty/serial: Add devicetree support for nVidia Tegra serial ports	2011-07-10 06:37:43 +09:00
usb	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
watchdog	watchdog: imx2_wdt: add device tree probe support	2011-07-26 21:19:16 +00:00
x86	x86: dt: Correct local apic documentation in device tree bindings	2011-02-28 09:58:06 +01:00
eeprom.txt	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
marvell.txt	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00
open-pic.txt	powerpc: Document the Open PIC device tree binding	2011-03-21 11:00:52 +11:00
xilinx.txt	dt: Move device tree documentation out of powerpc directory	2011-01-31 00:09:01 -07:00