Merge branch 'sh/stable-updates' into sh-latest

This commit is contained in:
Paul Mundt 2011-06-24 17:53:30 +09:00
commit 89576a62b3