Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Jan 2011 12:39:04 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Jan 2011 12:39:04 +0000 (12:39 +0000)
commit073154459b80a43f7e4f088b11c93c8e9cb07f14
treec81603910b742fbb0e4129034e5011364a9c7418
parentc76d292db9869ae73fd401e9a3fc728ed5caf0a7
parentea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab
Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable