Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:30:08 +0000 (20:30 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 20:30:08 +0000 (20:30 +0000)

Trivial merge