]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3798273 e6e5224)
Merge remote-tracking branch 'drivers-x86/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:53:52 +0000 (14:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:53:52 +0000 (14:53 +1100)
Conflicts:
drivers/platform/x86/chromeos_laptop.c


Trivial merge
Linux kernel for KaRo TX COM modules