Merge tomi/for-next
authorTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:47:23 +0000 (17:47 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 9 Dec 2009 01:47:23 +0000 (17:47 -0800)
Merge remote branch 'tomi/for-next' into tmp-rebuild-1260323192

Conflicts:
arch/arm/mach-omap2/io.c


Trivial merge