Merge remote-tracking branch 'pci-current/for-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:25:42 +0000 (11:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:25:42 +0000 (11:25 +1000)

Trivial merge