Merge remote-tracking branch 'i7300_edac/linux_next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:36:05 +0000 (12:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:36:05 +0000 (12:36 +1000)

Trivial merge