Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Feb 2012 22:04:41 +0000 (22:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Feb 2012 22:04:41 +0000 (22:04 +0000)

Trivial merge