Merge branches 'sh/g3-prep' and 'sh/stable-updates'
commit17eb9d62828c3688f41f31ac00d7fee6da9675bf
authorPaul Mundt <lethal@linux-sh.org>
Thu, 24 Dec 2009 06:16:41 +0000 (24 15:16 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 24 Dec 2009 06:16:41 +0000 (24 15:16 +0900)
tree03da91192242b6467d4f2d9d0b26f11f4da55c0c
parent76e7461a21dfe13565b2a323b53c8cc963541126
parentf34548cb735b7a80bbbb0bdd09ad4c2173ba92d5
Merge branches 'sh/g3-prep' and 'sh/stable-updates'