tree 8f5c38c32a0105e97ddb7af1466b5eefaa9df5ca
parent 91d3f9bacdb4950d2f79fe2ba296aa249f60d06c
parent c482ae4dcf23fd241321595d71bbe8aee33eabf5
author Russell King <rmk+kernel@arm.linux.org.uk> 1257425704 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1257425704 +0000

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