Merge branch 'fix-dss-mux' into fixes
authorTony Lindgren <tony@atomide.com>
Thu, 29 Mar 2012 17:05:37 +0000 (10:05 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 29 Mar 2012 17:05:37 +0000 (10:05 -0700)
commita2cb960f171228e17a28ff734289be60b75417c7
tree84bbe5acf032d197e72578486042158ac422ceb9
parent335aece5c502672fd0eb26ede5427ab14f4f7948
parente8a30b251bcf1999bea1726b3fc7ae186f551a6b
Merge branch 'fix-dss-mux' into fixes
arch/arm/mach-omap2/display.c