Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:13:09 +0000 (16:13 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:13:09 +0000 (16:13 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge