Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 14:20:21 +0000 (15:20 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Oct 2010 14:20:21 +0000 (15:20 +0100)

Trivial merge