]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48368c6 0b82411)
Merge remote-tracking branch 'hid/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:04:52 +0000 (11:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:04:52 +0000 (11:04 +1000)
Conflicts:
drivers/hid/hid-multitouch.c


Trivial merge
Linux kernel for KaRo TX COM modules