Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 12 Aug 2011 15:49:38 +0000 (15:49 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 12 Aug 2011 15:49:38 +0000 (15:49 +0000)
commit419bb4e0641cf7d84b1684b15afdd176f25c7ebe
tree41167d5ded971302600638029545e4baee796bed
parent143ed290f02496fb918789cf14949e4e8033d34d
parentaf9dafb1dcf320a46783e09764c758bc4e32ed94
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes