Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 19 Sep 2010 10:00:02 +0000 (11:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 19 Sep 2010 10:00:02 +0000 (11:00 +0100)

Trivial merge