]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit5e6b53146b70f55c088d091a7aaaf8bac0f88b46
tree148fade3046a57bfcdf49c7c399c43b763360f18
parent40fe9e0f22b2c6dfcf44b109fab636f25330f783
parentb814f0357fbe0ff8ad45a71b8733be5274edb747
Merge branch 'quilt/kernel-doc'

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