]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pci-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 23:59:34 +0000 (10:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 23:59:34 +0000 (10:59 +1100)
1  2 
drivers/pci/Kconfig

Simple merge