Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 15 Mar 2009 10:10:13 +0000 (10:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 15 Mar 2009 10:10:13 +0000 (10:10 +0000)

Trivial merge