summaryrefslogtreecommitdiff
path: root/drivers/watchdog
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2012-05-291-31/+25
|\
| * watchdog: MIPS: lantiq: implement OF support and minor fixesJohn Crispin2012-05-211-31/+25
* | Merge tag 'mfd-3.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-05-294-445/+134
|\ \
| * | watchdog: Convert iTCO_wdt driver to mfd modelAaron Sierra2012-05-094-445/+134
| |/
* | Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-05-262-7/+11
|\ \
| * \ Merge branch 'clk-next' of git://git.linaro.org/people/mturquette/linux into ...Arnd Bergmann2012-05-161-6/+10
| |\ \
| | * | ARM: Orion: WDT: Add clk/clkdev supportAndrew Lunn2012-05-081-6/+10
| * | | Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into...Arnd Bergmann2012-05-111-3/+3
| |\ \ \ | | | |/ | | |/|
| * | | watchdog imx2: prepare clk before enabling itSascha Hauer2012-04-251-1/+1
| | |/ | |/|
* | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-05-2316-392/+416
|\ \ \
| * | | watchdog: s3c2410_wdt: Set timeout to actually achieved timeoutHans de Goede2012-05-231-1/+1
| * | | watchdog: wm831x: Convert to gpio_request_one()Mark Brown2012-05-231-10/+3
| * | | watchdog: via_wdt: depends on PCIRandy Dunlap2012-05-231-1/+1
| * | | watchdog: ie6xx_wdt needs io.hRandy Dunlap2012-05-231-0/+1
| * | | watchdog: ie6xx_wdt.c: fix printk format warningRandy Dunlap2012-05-231-2/+2
| * | | watchdog: Add watchdog driver for Intel Atom E6XXAlexander Stein2012-05-233-0/+361
| * | | watchdog: it87_wdt: Add support for IT8728F watchdog.Diego Elio Pettenò2012-05-232-3/+11
| * | | watchdog: i6300esb: don't depend on X86Michael Olbrich2012-05-231-1/+1
| * | | watchdog: Use module_pci_driverWim Van Sebroeck2012-05-235-88/+9
| * | | watchdog: sch311x_wdt.c: Remove RESGENDave Mueller2012-05-231-34/+5
| * | | watchdog: s3c2410-wdt: Use of_match_ptr().Wim Van Sebroeck2012-05-231-3/+2
| * | | watchdog: Device tree support for pnx4008-wdtRoland Stigge2012-05-231-0/+10
| * | | watchdog: ar7_wdt.c: use devm_request_and_ioremapJulia Lawall2012-05-231-23/+10
| * | | watchdog: remove ixp2000 driverRob Herring2012-05-233-227/+0
| * | | watchdog: sp5100_tco.c: quiet sparse noise about using plain integer was NULL...H Hartley Sweeten2012-05-231-1/+1
* | | | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-shLinus Torvalds2012-05-232-213/+94
|\ \ \ \ | |/ / / |/| | |
| * | | watchdog: shwdt: Use finer grained clock control.Paul Mundt2012-05-101-7/+5
| * | | watchdog: shwdt: Preliminary runtime PM support.Paul Mundt2012-05-101-0/+8
| * | | watchdog: shwdt: Basic clock framework support.Paul Mundt2012-05-101-24/+26
| * | | watchdog: shwdt: Trim down private data structure.Paul Mundt2012-05-101-3/+0
| * | | watchdog: shwdt: Migrate to per-device locking.Paul Mundt2012-05-101-15/+19
| * | | watchdog: shwdt: Conversion to watchdog core.Paul Mundt2012-05-102-154/+45
| * | | watchdog: shwdt: Migrate from reboot notifier to platform shutdown.Paul Mundt2012-05-101-31/+12
| | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-1/+1
|\ \ \
| * | | Fix typo in various Kconfig fileMasanari Iida2012-04-161-1/+1
| | |/ | |/|
* | | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2012-05-211-22/+24
|\ \ \ | |_|/ |/| |
| * | x86/nmi: Add new NMI queues to deal with IO_CHK and SERRDon Zickus2012-04-251-7/+20
| * | watchdog, hpwdt: Remove priority option for NMI callbackDon Zickus2012-04-251-15/+4
| |/
* | hpwdt: Only BYTE reads/writes to WD Timer port 0x72Mingarelli, Thomas2012-04-261-3/+3
|/
* Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-03-291-0/+1
|\
| * ARM: pxa: use common IOMEM definitionRob Herring2012-03-251-0/+1
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2823-22/+1
|\ \
| * | Remove all #inclusions of asm/system.hDavid Howells2012-03-2822-22/+0
| * | Disintegrate asm/system.h for ARMDavid Howells2012-03-281-0/+1
* | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-03-28101-2810/+1765
|\ \ \
| * | | watchdog: txx9wdt: fix timeoutWim Van Sebroeck2012-03-271-8/+10
| * | | watchdog: Convert txx9wdt driver to watchdog frameworkAxel Lin2012-03-272-118/+38
| * | | watchdog: coh901327_wdt.c: fix timeoutWim Van Sebroeck2012-03-271-6/+10
| * | | watchdog: coh901327: convert to use watchdog coreLinus Walleij2012-03-272-137/+56
| * | | watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog coreViresh Kumar2012-03-271-0/+5