Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 10 Jan 2010 17:33:56 +0000 (17:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 10 Jan 2010 17:34:09 +0000 (17:34 +0000)

Trivial merge