diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 16:57:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-28 16:57:15 -0800 |
| commit | 1c36ab1a318ab5b3b502e7e4fff3628d1a97861f (patch) | |
| tree | a892fd40c1e19cf0f6efe89e3106113ca7759c29 /fs/binfmt_som.c | |
| parent | deb9b4ce97cbbf61a150f317badbeb7531aab276 (diff) | |
| parent | 84e83c2846ffb42772056a0f825d8578dc92d586 (diff) | |
| download | blackbird-op-linux-1c36ab1a318ab5b3b502e7e4fff3628d1a97861f.tar.gz blackbird-op-linux-1c36ab1a318ab5b3b502e7e4fff3628d1a97861f.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: iTCO_wdt: add Intel Lynx Point DeviceIDs
watchdog: via_wdt: Set min_timeout and max_timeout for wdt_dev
watchdog: Fix typo "unexpectdly"
watchdog: wafer5823wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
watchdog: wm8350_wdt: Fix handling WDIOS_DISABLECARD/WDIOS_ENABLECARD options
watchdog: Return proper error in nuc900wdt_probe if misc_register fails
watchdog: Staticise nuc900_wdt
watchdog: via_wdt: Staticise wdt_pci_table
watchdog: omap_wdt.c: Fix the mismatch of pm_runtime enable and disable
watchdog: dw_wdt.c: use devm_request_and_ioremap
watchdog: imx2_wdt.c: use devm_request_and_ioremap
Diffstat (limited to 'fs/binfmt_som.c')
0 files changed, 0 insertions, 0 deletions
