summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 05:26:32 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-03 05:26:32 +0200
commit497ff0344432d1c4ab493ce163a87410064b8d91 (patch)
treefbb4f5038622f475bf40d61047b3c3cf44a3d068 /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentInput: wm831x-ts - move BTN_TOUCH reporting to data transfer (diff)
downloadlinux-497ff0344432d1c4ab493ce163a87410064b8d91.tar.xz
linux-497ff0344432d1c4ab493ce163a87410064b8d91.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: wm831x-ts - move BTN_TOUCH reporting to data transfer Input: wm831x-ts - allow IRQ flags to be specified Input: wm831x-ts - fix races with IRQ management
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions