Merge branch 'fix-dss-mux' into fixes
Tony Lindgren [Thu, 29 Mar 2012 17:05:37 +0000 (10:05 -0700)]
1  2 
arch/arm/mach-omap2/display.c

Simple merge