tree 976958bf8e4989a69901bfbb25dd6463728c6cb5
parent 5e27fb78df95e027723af2c90ecc9b4527ae59e9
parent d30e5d897c3da7c2d17c8112331b66ed953eec78
author Russell King <rmk+kernel@arm.linux.org.uk> 1276022408 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1276022408 +0100

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