Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:26:16 +0000 (23:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 11 Jul 2011 21:26:16 +0000 (23:26 +0200)

Trivial merge