tree bda182d9407e32354620e9188258c86cad2e3813
parent 22325525d8bb1478daddefec1b762e7882bcd515
parent d13fecd0293d55a4bcb8a31078216504192d8ce0
author Russell King <rmk+kernel@arm.linux.org.uk> 1262967517 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1262967517 +0000

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