]> 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>
Tue, 13 Dec 2011 00:30:41 +0000 (11:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:30:41 +0000 (11:30 +1100)

Trivial merge