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)

Trivial merge