| commit | 497ff0344432d1c4ab493ce163a87410064b8d91 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 20:26:32 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 02 20:26:32 2011 -0700 |
| tree | fbb4f5038622f475bf40d61047b3c3cf44a3d068 | |
| parent | 5933f2ae353a93b1d3b501bc63c925531849bbc7 [diff] | |
| parent | bf283707d5fb174ec09215ae19860ad04ba7b67a [diff] |
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