Merge branches 'sh/core' and 'sh/serial-rework' into sh-fixes-for-linus
authorPaul Mundt <[email protected]>
Fri, 4 Nov 2011 13:48:36 +0000 (22:48 +0900)
committerPaul Mundt <[email protected]>
Fri, 4 Nov 2011 13:48:36 +0000 (22:48 +0900)

Trivial merge