]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/kernel-doc'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 03:18:16 +0000 (14:18 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 03:18:16 +0000 (14:18 +1100)
commit481b4deed98d67a2a013816bdf3135186e83e949
tree22f1daa5ccfec7bfe9b923da50b8547975a754a1
parent118ee644a16aaf59f152dc0cbaa763a3aa691ab3
parentb814f0357fbe0ff8ad45a71b8733be5274edb747
Merge branch 'quilt/kernel-doc'

Conflicts:
Documentation/PCI/pci.txt
Documentation/laptops/thinkpad-acpi.txt