Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
authorRussell King <[email protected]>
Thu, 6 Nov 2008 18:04:23 +0000 (18:04 +0000)
committerRussell King <[email protected]>
Thu, 6 Nov 2008 18:04:23 +0000 (18:04 +0000)

Trivial merge