diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-07-26 15:16:05 -0500 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-07-26 15:16:05 -0500 |
commit | 3b9a28f119e2f25173ec4e34482a8447928cb49a (patch) | |
tree | 4c1139f5866bdabfd2b264f9156d292d403ce0a4 | |
parent | 25f6c671122a92bab2b46eee7449ecbc2f81c8bf (diff) |
Update for 26072013linaro-no-preempt-rt
-rw-r--r-- | manifest | 21 | ||||
-rw-r--r-- | manifest.pin | 16 |
2 files changed, 13 insertions, 24 deletions
@@ -5,17 +5,22 @@ #topic mainline upstream/master PIN v3.4-rc7 merge #topic gator lt_arm/tracking-armlt-gator TIP 01f94777ed39ba7679cfa75fc2280595659fbfcc merge # -topic linux-3.8.y linux_stable/linux-3.8.y PIN v3.8.13 merge -topic config-core-3.8 configs/config-core-3.8 TIP - merge -topic config-boards-3.8 configs/config-boards-3.8 TIP - merge -topic arndale-rt linux-linaro-lng/arndale-rt TIP - merge -topic arndale-configs linux-linaro-lng/configs-3.8-arndale TIP - merge +topic linaro-no-preempt-rt TIP ffc00a9e717ac2703138d67920e947351f615248 merge +topic tracking-v3.10-arndale TIP eebc901f7f06d900b5588323f184054232579526 merge +topic tracking-kernel.org-3.10.y TIP 81a464838675307c9fc7909fc840f248ed2caed5 merge +topic tracking-arm-nohz-v3.10 TIP 9ed9caba41ffffe11a820f41a7b6a339ef4a2c3b merge +topic tracking-config-boards-3.10 TIP b8f63d634eaa2d5ccad39c04519dad5e2553a40b merge +topic tracking-config-core-3.10 TIP 198e844c69cdbe0536467ccf376efff9607e54dd merge +topic tracking-v.3.10-arndale - TIP eebc901f7f06d900b5588323f184054232579526 merge + # # remote <remote name> <remote URL> # Examples: #remote upstream git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git #remote lt_arm git://git.linaro.org/landing-teams/working/arm/kernel.git # -remote linux_stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git -remote linux-linaro-lng git://git.linaro.org/kernel/linux-linaro-lng.git -remote configs git://git.linaro.org/kernel/configs.git +remote kernel.org-3.10.y https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git +remote no_hz_full https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux.git +remote kvm ssh://git.linaro.org/srv/git.linaro.org/git/people/cdall/linux-kvm-arm.git +remote linaro-configs ssh://git.linaro.org/srv/git.linaro.org/git/kernel/configs.git + diff --git a/manifest.pin b/manifest.pin deleted file mode 100644 index 0a019b0..0000000 --- a/manifest.pin +++ /dev/null @@ -1,16 +0,0 @@ -# Autogenerated PINNED manifest for linaro-no-preempt-rt -# Date: 20130625-23:09:30 -# -# topics -# -topic linux-3.8.y linux_stable/linux-3.8.y PIN dbf932a9b316d5b29b3e220e5a30e7a165ad2992 merge -topic config-core-3.8 configs/config-core-3.8 PIN e60f2f9a8d28c2326a27183f6b611189056ac684 merge -topic config-boards-3.8 configs/config-boards-3.8 PIN d289a4500cab3c5ec8047c34c005cb7097f4ef61 merge -topic arndale-rt linux-linaro-lng/arndale-rt PIN 86c08fa921a5839399bd13d23c535fde2e086c5a merge -topic arndale-configs linux-linaro-lng/configs-3.8-arndale PIN 55af205628c05ae4b5f708e0d90fdf21927bd98d merge -# -# remotes -# -remote linux_stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git -remote linux-linaro-lng git://git.linaro.org/kernel/linux-linaro-lng.git -remote configs git://git.linaro.org/kernel/configs.git |