]> 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>
Tue, 2 Apr 2013 05:44:02 +0000 (16:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Apr 2013 05:44:02 +0000 (16:44 +1100)
commit7f3091009635eba742e5e7aa4e111b5d2517e678
tree26a99561cf11f0d8cb9cc4f0e73576b3fa8fa3cf
parentc2046fda2a8d421e18b36ad603e9e98948df6d35
parente6e522461d358891050522ddb4fbfe9c253947b4
Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
drivers/platform/x86/chromeos_laptop.c