tree fbb4f5038622f475bf40d61047b3c3cf44a3d068
parent 5933f2ae353a93b1d3b501bc63c925531849bbc7
parent bf283707d5fb174ec09215ae19860ad04ba7b67a
author Linus Torvalds <torvalds@linux-foundation.org> 1304393192 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304393192 -0700

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