]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pci/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 00:25:48 +0000 (11:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 00:25:48 +0000 (11:25 +1100)
1  2 
drivers/pci/pci-driver.c
drivers/pci/pci.c

Simple merge
Simple merge