Merge branch 'for-next-2.6.30'
authorTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 10:19:13 +0000 (13:19 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Jun 2009 10:19:13 +0000 (13:19 +0300)
Conflicts:
arch/arm/mach-omap2/Makefile


Trivial merge