Merge branch 'devel-misc' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
commit055a1b8c9927bc587f293020a54c6cd8e24dfac0
treedb7c8d00931180c4896c9e00d2cb506939592cda
parent8a6f7e14fc3b3ea911838c3f4ce137cb8a3d134a
parentf535daed925c2d3c1db06b06a63c4955f2c51988
Merge branch 'devel-misc' into omap-for-linus
arch/arm/mach-omap1/mux.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/mux.h