Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:34:16 +0000 (17:34 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:34:16 +0000 (17:34 +0000)

Trivial merge