Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 May 2011 03:26:32 +0000 (20:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 May 2011 03:26:32 +0000 (20:26 -0700)
commit497ff0344432d1c4ab493ce163a87410064b8d91
treefbb4f5038622f475bf40d61047b3c3cf44a3d068
parent5933f2ae353a93b1d3b501bc63c925531849bbc7
parentbf283707d5fb174ec09215ae19860ad04ba7b67a
Merge branch 'for-linus' of git://git./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
include/linux/mfd/wm831x/pdata.h