tree 96c6e79c22ba65a47685097460b8e0168a2ff431
parent 2528ed119b8f4fc553f9d1e65719ae183ffa97f4
parent 6ec04f434d29aed33608e0ca4d8b100190e71e96
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1243073765 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1243073765 +0100

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