tree 25984e5d3941f37a72a5cd4ef8a6bafcaccc86a3
parent cefdb2a4436ec83b4c8b349aa30f976d30c22e25
parent 1efb71809fd47bc19b3ce05080e1d5085a8dfab1
author Eric Miao <eric.miao@marvell.com> 1237773309 +0800
committer Eric Miao <eric.miao@marvell.com> 1237773314 +0800

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel