Merge branch 'fix-dss-mux' into fixes

This commit is contained in:
Tony Lindgren 2012-03-29 10:05:37 -07:00
commit a2cb960f17