aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-12-131-1/+1
|\
| * Fix misspellings of "whether" in comments.Adam Buchbinder2012-11-191-1/+1
* | Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-12-131-2/+0
|\ \
| * \ Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/...Olof Johansson2012-11-301-2/+0
| |\ \
| | * | watchdog: OMAP: fixup for ARM multiplatform supportTony Lindgren2012-11-301-2/+0
* | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-131-0/+11
|\ \ \ \ | |/ / /
| * | | Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into ne...Olof Johansson2012-11-201-0/+11
| |\ \ \
| | * | | watchdog: at91sam9_wdt: add device tree supportFabio Porcedda2012-11-161-0/+11
| | | |/ | | |/|
| * | | Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dtArnd Bergmann2012-11-161-1/+0
| |\ \ \ | | |_|/ | |/| |
* | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-122-15/+12
|\ \ \ \
| * \ \ \ Merge tag 'omap-for-v3.8/cleanup-prcm-part2-signed' of git://git.kernel.org/p...Arnd Bergmann2012-11-151-14/+12
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | watchdog: OMAP: use standard GETBOOTSTATUS interface; use platform_data fn ptrPaul Walmsley2012-11-081-14/+12
| | |/
| * | watchdog: imx2_wdt: remove unneeded mach/hardware.h inclusionShawn Guo2012-10-151-1/+0
| |/
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-12-121-4/+2
|\ \
| * | WATCHDOG: fix build PM warningsRussell King2012-11-081-4/+2
| |/
* | watchdog: remove use of __devexitBill Pemberton2012-11-2852-56/+56
* | watchdog: remove use of __devinitdataBill Pemberton2012-11-283-3/+3
* | watchdog: remove use of __devinitBill Pemberton2012-11-2852-72/+72
* | watchdog: remove use of __devexit_pBill Pemberton2012-11-2850-50/+50
|/
* Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg...Linus Torvalds2012-10-071-11/+10
|\
| * m68knommu: clean up ColdFire 54xx General Timer definitionsGreg Ungerer2012-09-271-11/+10
* | Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-10-051-0/+1
|\ \
| * | mfd: lpc_ich: Add Device IDs for Intel Lynx Point-LP PCHJames Ralston2012-09-161-0/+1
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-013-4/+21
|\ \ \
| * \ \ Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/l...Olof Johansson2012-09-161-0/+5
| |\ \ \
| | * | | ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+Tony Lindgren2012-09-121-0/+5
| * | | | Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanupOlof Johansson2012-09-122-5/+3
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'ks8695/timer' into next/cleanupOlof Johansson2012-09-111-1/+13
| |\ \ \ \
| | * | | | watchdog: ks8695: sink registers into driverLinus Walleij2012-09-111-1/+13
| | | |/ / | | |/| |
| * | | | ARM: mach-pnx4008: Remove architectureRoland Stigge2012-08-261-3/+3
| |/ / /
* | | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-10-011-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into ...Olof Johansson2012-09-131-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | watchdog/mpc8xxx: add a const qualifierArnd Bergmann2012-09-111-1/+1
| | |/
* | | watchdog: move the dereference below the NULL testWei Yongjun2012-09-101-1/+2
* | | hpwdt: Fix kdump issue in hpwdtToshi Kani2012-09-101-0/+3
|/ /
* | watchdog: da9052: Remove duplicate inclusion of delay.hSachin Kamat2012-08-291-1/+0
* | booke/wdt: some ioctls do not return values properlyTiejun Chen2012-08-171-4/+3
|/
* Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-08-021-0/+8
|\
| * ARM: Orion: DTify the watchdog timer.Andrew Lunn2012-07-271-0/+8
* | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-07-271-7/+7
|\ \
| | \
| | \
| *-. \ Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King2012-07-271-7/+7
| |\ \ \ | | |_|/ | |/| |
| | | * ARM: sa11x0/pxa: convert OS timer registers to IOMEMRussell King2012-07-091-7/+7
| | |/
* | | Merge git://www.linux-watchdog.org/linux-watchdogLinus Torvalds2012-07-2411-361/+121
|\ \ \
| * | | watchdog: orion_wdt: Convert driver to watchdog coreAxel Lin2012-07-232-153/+51
| * | | watchdog: s3c2410_wdt: Use module_platform_driver()Sachin Kamat2012-07-231-15/+1
| * | | watchdog: sch311x_wdt: Fix Polarity when starting watchdogWim Van Sebroeck2012-07-231-2/+8
| * | | Watchdog: OMAP: Fix the runtime pm code to avoid module getting stuck intrans...Lokesh Vutla2012-07-231-17/+0
| * | | watchdog: ie6xx_wdt: section mismatch in ie6xx_wdt_probe()Gerard Snitselaar2012-07-231-2/+2
| * | | watchdog: bcm63xx_wdt: fix driver section mismatchFlorian Fainelli2012-07-231-2/+2
| * | | watchdog: iTCO_wdt.c: convert to watchdog coreWim Van Sebroeck2012-07-232-165/+49