This is the merge result from the following branches:

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

Greg KH's stable branch at v2.6.35.1
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.35.y.git

RMK's "devel" branch at commit 7b70c427
(merged into mainline with commit be82ae02)

Catalin Marinas' "stable-2.6.35" branch at commit 2d73da46
git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git

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

Tony Lindgren's "omap-for-linus" branch at commit d21872b3
(merged into mainline with commit d71048e2)

Uwe Kleine-König's "arm/booting" branch has been dropped as it is now
included in RMK's "devel" branch.