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>
Sun, 22 Nov 2009 17:11:06 +0000 (17:11 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 22 Nov 2009 17:11:06 +0000 (17:11 +0000)
commitc8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab
treed82bfd71ad57f826cf455422a9f88743373f9bcc
parentf8d5e5a8f5be475796c7f357e43546c2d7f44540
parent81065518eda14ebbce1b48c98d5077b0a059d4a3
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6