diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-06 11:27:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-06 11:27:25 -0800 |
commit | 19b022572b9e0fa8ce5490db888714ecb2b1293e (patch) | |
tree | accc2ff5dee2b2062aeda1361cf0adb30d5146f6 /drivers/hid/hid-emsff.c | |
parent | 15bd1e5cb36306a015328aa1c2b6470a25153171 (diff) | |
parent | 5476b2b77dae50c88aa6a85f21abeac38dde590f (diff) | |
download | linux-19b022572b9e0fa8ce5490db888714ecb2b1293e.tar.bz2 |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fix from Wim Van Sebroeck:
"Fix the watchdog mask bit offset for Exynos7"
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7
Diffstat (limited to 'drivers/hid/hid-emsff.c')
0 files changed, 0 insertions, 0 deletions