Merge branch 'fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into...
authorArnd Bergmann <[email protected]>
Tue, 6 Dec 2011 14:17:22 +0000 (14:17 +0000)
committerArnd Bergmann <[email protected]>
Tue, 6 Dec 2011 14:17:22 +0000 (14:17 +0000)

Trivial merge