This is the merge result from the following branches:

Linus' tree at v2.6.35-rc5-43-gf469461
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

RMK's "devel" branch at commit 414a0eac
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git

Catalin Marinas' "rebased" branch at commit 4298370d
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git

Will Deacon's "for-linaro" branch at commit 1d4a8e2c
git://repo.or.cz/linux-2.6/linux-wd.git

Uwe Kleine-König's "arm/booting" branch at commit e69edc79
git://git.pengutronix.de/git/ukl/linux-2.6.git
(this also contains patches from Eric Miao for automatic ZRELADDR)

The Ubuntu Maverick branch has been dropped per general request.