Merge branches 'common/serial-rework' and 'sh/stable-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Wed, 29 Jun 2011 08:40:44 +0000 (17:40 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 29 Jun 2011 08:40:44 +0000 (17:40 +0900)

Trivial merge