Merge branches 'debug' and 'idle' into for-armsoc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 Jan 2012 11:59:04 +0000 (11:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 Jan 2012 11:59:13 +0000 (11:59 +0000)

Trivial merge