Merge branch 'omap3-upstream' into for-next

Conflicts:
	arch/arm/mach-omap2/serial.c
This commit is contained in:
Tony Lindgren 2009-05-28 15:44:54 -07:00
commit 970a724d91
10 changed files with 352 additions and 30 deletions