tree 43d49d474032673062d1c9d40695d6698bffe7af
parent 66e1cfe6d52c69d317e9df76ebc8538a34af0d51
parent 285ca2ee31a5999e6498e6b2466f346bb5f0047c
author Russell King <rmk+kernel@arm.linux.org.uk> 1297464979 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1297464979 +0000

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