Merge branch 'sh/st-integration' into sh/urgent

This commit is contained in:
Paul Mundt 2012-04-19 16:01:22 +09:00
commit f5bdb003a2