]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'drivers-x86/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 02:54:47 +0000 (13:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 02:54:47 +0000 (13:54 +1100)
1  2 
drivers/platform/x86/intel-hid.c

Simple merge