Merge branch 'master' into sh/cachetlb
authorPaul Mundt <lethal@linux-sh.org>
Fri, 14 Aug 2009 20:58:45 +0000 (05:58 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 14 Aug 2009 20:58:45 +0000 (05:58 +0900)

Trivial merge