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

Simple merge
Simple merge