diff options
| author | Linus Torvalds | 2014-08-06 20:54:47 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2014-08-06 20:54:47 -0700 |
| commit | a1b0a006ea7eb0c272cef33740a9563cd5190974 (patch) | |
| tree | 3cde797e023d0fbe676b064a843c655a1131426a /drivers/hid | |
| parent | 7725131982477bffff8ffdea143434dcc69f5d90 (diff) | |
| parent | 440e96bc770eb98b17a763defb9641c77f9a7755 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
- remove unnecessary checks after platform_get_resource()
- fix watchdog api documentation typo's
- imx2_wdt: adds big endianness support
- move restart code to the sunxi watchdog driver
* git://www.linux-watchdog.org/linux-watchdog:
wdt: sunxi: Move restart code to the watchdog driver
Documentation: fix two typos in watchdog-api.txt
watchdog: imx2_wdt: adds big endianness support.
watchdog: shwdt: Remove the unnecessary check of resource after platform_get_resource()
watchdog: lantiq_wdt: Remove the un-necessary check of resource after platform_get_resource()
watchdog: dw_wdt: Remove the un-necessary check after platform_get_resource()
Diffstat (limited to 'drivers/hid')
0 files changed, 0 insertions, 0 deletions