]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'acpi/test'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 01:21:51 +0000 (11:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Aug 2011 01:21:51 +0000 (11:21 +1000)
1  2 
Documentation/kernel-parameters.txt
arch/s390/Kconfig

Simple merge
Simple merge