]> 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>
Wed, 3 Aug 2011 03:32:37 +0000 (13:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Aug 2011 03:32:37 +0000 (13:32 +1000)
commit482f25534eb28767471d39c7f945e8df405db152
tree7329ffeb8a5ad434099a685708be82346fc94a0a
parent5cb076866492cb2dd1c6bfd2bc6286017f97d8df
parentcf98853cbd4878db2d0bee5f5e8911ed0d5d1ca9
Merge remote-tracking branch 'drivers-x86/linux-next'

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
drivers/platform/x86/asus-wmi.c
include/linux/input.h