]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5933f2a bf28370)
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)
* '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

1  2 
include/linux/mfd/wm831x/pdata.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/mfd/wm831x/pdata.h
Simple merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG