24297305288b53ba8aae527b4
author Russell King <rmk+kernel@arm.linux.org.uk> 1298821236 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1298821236 +0000

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
<ày�ž!x