]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pci/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:27:20 +0000 (08:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:27:20 +0000 (08:27 +1100)

Trivial merge