Merge branch 'omap-upstream' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:41:03 +0000 (15:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:41:03 +0000 (15:41 -0700)
commitc81592ba1b012d555d0cb7ec711afda89c327469
tree44e36c4785fc6169b971922097d7b3941101b3e1
parentc912f7e1eae169aaca333b4c5da3f36c98f2ccb0
parent088962c243db42b9c608f30be3e3a05a5b696895
Merge branch 'omap-upstream' into for-next

Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/Makefile
arch/arm/plat-omap/sram.c