Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Nov 2009 12:55:04 +0000 (12:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Nov 2009 12:55:04 +0000 (12:55 +0000)
commiteef3044965740a5e153d7b1e456e1b3e0fc3e619
tree8f5c38c32a0105e97ddb7af1466b5eefaa9df5ca
parent91d3f9bacdb4950d2f79fe2ba296aa249f60d06c
parentc482ae4dcf23fd241321595d71bbe8aee33eabf5
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6