Merge branch 'sh/st-integration' into sh/urgent
authorPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 07:01:22 +0000 (16:01 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 07:01:22 +0000 (16:01 +0900)
commitf5bdb003a2ee6df5ab9bfa119df905f949a66b52
tree3c8b799ee7e069fb9befd1ba08ae350ec26a62e2
parent932e9f352b5d685725076f21b237f7c7d804b29c
parent8d9a784d1e2c75e0dcae06f77a02f5e7bb547f3a
Merge branch 'sh/st-integration' into sh/urgent