Merge branch 'omap-upstream' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:41:03 +0000 (15:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:41:03 +0000 (15:41 -0700)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge