]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drivers-x86/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:49:24 +0000 (12:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:49:24 +0000 (12:49 +1000)
commita13d8202f0b0c4afb14589b9c69ab47386b7fcbb
tree8b9b530ee980e013c993ee87761c88e5903b53f2
parent6275581f1ba040569c5077909f09c1b2c4728eb2
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