Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:45:40 +0000 (12:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:45:40 +0000 (12:45 +1000)

Trivial merge