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)
commit970a724d9173526512ebd8be991a4cbe18b7aace
tree7541c2b34e82ccabb068bdae530936838a71fad8
parentc81592ba1b012d555d0cb7ec711afda89c327469
parent4a899d5e93fd974952492cd4a09e98b209d1ad58
Merge branch 'omap3-upstream' into for-next

Conflicts:
arch/arm/mach-omap2/serial.c
arch/arm/mach-omap2/serial.c