]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/kernel-doc'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:22:33 +0000 (14:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:22:33 +0000 (14:22 +1100)
Conflicts:
Documentation/PCI/pci.txt

1  2 
Documentation/laptops/thinkpad-acpi.txt