Merge for-next
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:36 +0000 (18:32 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 01:32:36 +0000 (18:32 -0700)
Conflicts:
arch/arm/configs/n8x0_defconfig


Trivial merge