Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorroot <root@dyn-67.arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 24 Mar 2009 22:04:25 +0000 (22:04 +0000)

Trivial merge