Merge branches 'sh/st-integration' and 'sh/stackprotector' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)

Trivial merge