]> 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>
Fri, 5 Aug 2011 00:59:19 +0000 (10:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 5 Aug 2011 00:59:19 +0000 (10:59 +1000)

Trivial merge