Merge for-next
authorTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:16 +0000 (15:14 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:14:16 +0000 (15:14 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge