summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-22 20:46:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-22 20:46:15 +0200
commit27efd7e2e6d052e543425dba172d96f42704ef65 (patch)
treeb3c4bbb867b194750586cacff26c8455051ea259 /drivers/watchdog
parentMerge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff)
parentInput: synaptics - relax capability ID checks on newer hardware (diff)
downloadlinux-27efd7e2e6d052e543425dba172d96f42704ef65.tar.xz
linux-27efd7e2e6d052e543425dba172d96f42704ef65.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: synaptics - relax capability ID checks on newer hardware Input: twl40300-keypad - fix handling of "all ground" rows Input: gamecon - reference correct pad in gc_psx_command() Input: gamecon - reference correct input device in NES mode Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi' Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table Input: qt2160 - rename kconfig symbol name
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions