]> 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>
Wed, 12 Oct 2011 00:22:37 +0000 (11:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 00:22:37 +0000 (11:22 +1100)

Trivial merge