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


Trivial merge