Merge branch 'omap-upstream'
authorTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2009 17:04:59 +0000 (20:04 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2009 17:04:59 +0000 (20:04 +0300)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge