]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4aed35 9b7e31b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 16:50:39 +0000 (09:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 16:50:39 +0000 (09:50 -0700)
Pull input layer fixes from Dmitry Torokhov:
 "Two fixes for regressions in Wacom driver and fixes for drivers using
  threaded IRQ framework without specifying IRQF_ONESHOT."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: request threaded-only IRQs with IRQF_ONESHOT
  Input: wacom - don't retrieve touch_max when it is predefined
  Input: wacom - fix retrieving touch_max bug
  Input: fix input.h kernel-doc warning

1  2 
drivers/input/joystick/as5011.c patch | diff1 | diff2 | blob | history
drivers/input/tablet/wacom_sys.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/joystick/as5011.c
Simple merge
diff --cc drivers/input/tablet/wacom_sys.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.