The following commit has been merged in the linux branch: commit 50ad5f591bf0d2c877cb3689be01bea9eefdeb2b Merge: daaeb6c93829806221b2ac533330c64f338ebb89 f6919eb41127db2e06342efcc2da1eeb4646ec34 Author: Russell King rmk+kernel@arm.linux.org.uk Date: Sat Oct 17 16:29:01 2009 +0100

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