Merge for-next
authorTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:13 +0000 (17:15 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 25 Sep 2010 00:15:13 +0000 (17:15 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge