Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh...
authorPaul Mundt <[email protected]>
Wed, 13 Jun 2012 03:01:33 +0000 (12:01 +0900)
committerPaul Mundt <[email protected]>
Wed, 13 Jun 2012 03:01:33 +0000 (12:01 +0900)

Trivial merge