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)
commit24109afd17426e1a2b72141e4a2b730057e1a0ea
tree590f708decdc1144dd50d4723c5d106d4e248452
parent659fb32d1b67476f4ade25e9ea0e2642a5b9c4b5
parent512b7938fefd03d512463aa597a1216cf088dfe3
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes