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>
Mon, 16 Nov 2009 20:59:25 +0000 (20:59 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 16 Nov 2009 20:59:25 +0000 (20:59 +0000)
commit112a674f2f68b17ae253fe7312afc38c3e75be7a
tree093917618ce78ca1012e13d5fe416927cd74bb6f
parente12399fec3793e0c2b75d366c7fd48a360f6e328
parent7df56c2586049a06b007474ca059779c81ddb1ff
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6