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)
commit56f54e7d671969da13693e5a147438f2cc50ca9b
tree888fa7296d34d26354ae20e8391dac880406d942
parentd92c9d5b38cd2932de463df1afa7a67fbf9207ef
parente4b3bbe31d9a1e9540c6e9c95f5e7fd92acbcacf
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes