Merge remote-tracking branch 'xtensa/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:43:13 +0000 (11:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:43:13 +0000 (11:43 +1000)
Conflicts:
arch/xtensa/configs/iss_defconfig


Trivial merge