parent 76e7461a21dfe13565b2a323b53c8cc963541126 parent f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 author Paul Mundt 1261635401 +0900 committer Paul Mundt 1261635401 +0900 Merge branches 'sh/g3-prep' and 'sh/stable-updates' ¿A]éž