diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 19:57:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 19:57:43 -0800 |
commit | 17c7f85460d6b0e2bd11a736683bd81c4388474f (patch) | |
tree | 44a50a722b7a3de27bc4943f52fdb0fee336dfb5 /drivers/input/misc/pcf8574_keypad.c | |
parent | f7a6ad9fa24e4511a143e2b7b8a0d55864fe2edf (diff) | |
parent | ea3d4011a871e1802e201086195c61e6dbeaf6d5 (diff) |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
- new driver for bcm281xx watchdog device
- new driver for gpio based watchdog devices
- remove DEFINE_PCI_DEVICE_TABLE macro for watchdog device drivers
- conversion of davinci_wdt and mpc8xxx_wdt to watchdog core
- improvements on davinci_wdt, at91/dt, at91sam9_wdt and s3c2410_wdt
- Auto-detect IO address and expand supported chips on w836* super-I/O
chipsets
- core: Make dt "timeout-sec" property work on drivers w/out min/max
- fix Kconfig dependencies
- sirf: Remove redundant of_match_ptr helper
- mach-moxart: add restart handler
- hpwdt patch to display better panic information
- imx2_wdt: disable watchdog timer during low power mode
* git://www.linux-watchdog.org/linux-watchdog: (31 commits)
watchdog: w83627hf_wdt: Reset watchdog trigger during initialization
watchdog: w83627hf: Add support for W83697HF and W83697UG
watchdog: w83627hf: Auto-detect IO address and supported chips
watchdog: at91sam9_wdt: increase security margin on watchdog counter reset
watchdog: at91sam9_wdt: avoid spurious watchdog reset during init
watchdog: at91sam9_wdt: fix secs_to_ticks
ARM: at91/dt: add watchdog properties to kizbox board
ARM: at91/dt: add sam9 watchdog default options to SoCs
watchdog: at91sam9_wdt: update device tree doc
watchdog: at91sam9_wdt: better watchdog support
watchdog: sp805_wdt depends also on ARM64
watchdog: mach-moxart: add restart handler
watchdog: mpc8xxx_wdt convert to watchdog core
watchdog: sirf: Remove redundant of_match_ptr helper
watchdog: hpwdt patch to display informative string
watchdog: dw_wdt: remove build dependencies
watchdog: imx2_wdt: disable watchdog timer during low power mode
watchdog: s3c2410_wdt: Report when the watchdog reset the system
watchdog: s3c2410_wdt: use syscon regmap interface to configure pmu register
watchdog: s3c2410_wdt: Handle rounding a little better for timeout
...
Diffstat (limited to 'drivers/input/misc/pcf8574_keypad.c')
0 files changed, 0 insertions, 0 deletions