tree ba054d4b1a20dadec088fd4d8983fb5939227e46
parent aec995900fbc8cffa9f0f9e797ef07a0beb2b079
parent 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8
author Russell King <rmk+kernel@arm.linux.org.uk> 1302733933 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1302733933 +0100

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