]> 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>
Tue, 15 Nov 2011 22:47:06 +0000 (09:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:47:06 +0000 (09:47 +1100)
1  2 
drivers/pci/Kconfig

Simple merge