]> 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, 26 Jul 2011 04:12:27 +0000 (14:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 04:12:27 +0000 (14:12 +1000)
commit20918f2477c175e9fd6a32146e05614222c085db
tree68dc586c870fb757f7524fc6b5828d2ac767a778
parentb341cecb55ef7489f271170c77218aef89bdac5b
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