aboutsummaryrefslogtreecommitdiff
tag namelinaro_merge_100712 (607e1fb3acfad15696a2515147da7af36a176a89)
tag date2010-07-13 00:23:36 -0400
tagged byNicolas Pitre <nicolas.pitre@linaro.org>
tagged objectcommit 5ea80220d7...
downloadlinux-linaro-linaro_merge_100712.tar.gz
This is the merge result from the following branches:
Linus' v2.6.35-rc5 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 Ubuntu Maverick at commit 78e9e778 git://kernel.ubuntu.com/ubuntu/ubuntu-maverick.git RMK's devel branch at commit 3712d8e6 http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git Catalin Marinas' "rebased" branch at commit 3a9a55c7 git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm.git Will Deacon's "for-linaro" branch at commit 6741018f 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 security branch from Nicolas Pitre was dropped as it has been merged into RMK's devel branch at this point.