Merge branch 'devel-misc' into omap-for-linus

author Tony Lindgren <tony@atomide.com>

Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)

committer Tony Lindgren <tony@atomide.com>

Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
author Tony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
committer Tony Lindgren <tony@atomide.com>
Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
diff --cc arch/arm/mach-omap1/mux.c
Simple merge
diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge
diff --cc arch/arm/mach-omap2/board-devkit8000.c
Simple merge
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/mux.h
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 2 Aug 2010 11:23:38 +0000 (14:23 +0300)
		1	2
arch/arm/mach-omap1/mux.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-2430sdp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-rx51-peripherals.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/include/plat/mux.h	patch \|	diff1 \|	diff2 \|	blob \| history