Merge branch 'devel-board' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 23:14:02 +0000 (15:14 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Dec 2010 23:14:02 +0000 (15:14 -0800)
commitfea83f6a9b0a90fefca16ac3534e308f6c34144b
tree3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5
parentdf127ee375af4cb40b979605e0c336fc79bd38e7
parent2d200665c37f544f648d77a05a06ab63328f0d3a
Merge branch 'devel-board' into omap-for-linus
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/include/plat/uncompress.h
arch/arm/plat-omap/sram.c