]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commite7fa0f423bdd091fb3316d463e7e9c8f1367487d
tree940c8d2af52ecd79351dd109a77275300c31885f
parent379827313ff0b7f2939e93dd512802a9f79e71c9
parente6e522461d358891050522ddb4fbfe9c253947b4
Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
drivers/platform/x86/chromeos_laptop.c