From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:22:33 +0000 (+1100)
Subject: Merge branch 'quilt/kernel-doc'
X-Git-Tag: next-20111103~47
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5e6b53146b70f55c088d091a7aaaf8bac0f88b46;p=karo-tx-linux.git

Merge branch 'quilt/kernel-doc'

Conflicts:
	Documentation/PCI/pci.txt
---

5e6b53146b70f55c088d091a7aaaf8bac0f88b46