Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 22 Sep 2010 17:32:37 +0000 (10:32 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Sep 2010 17:32:37 +0000 (10:32 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge