[oe-commits] org.oe.dev linux-rp: move collie back to 2.6.20 for now

[koen commit]

linux-rp: move collie back to 2.6.20 for now

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 96df5dae22f2fb36fef351f22763d1b0524d1dfa
ViewMTN: http://monotone.openembedded.org/revision/info/96df5dae22f2fb36fef351f22763d1b0524d1dfa
Files:
1
packages/linux/linux-rp_2.6.20.bb
packages/linux/linux-rp_2.6.21.bb
Diffs:

#
# mt diff -r8dae392c90d544d3485dcec191f580ea0fc57a19 -r96df5dae22f2fb36fef351f22763d1b0524d1dfa
#
# 
# 
# patch "packages/linux/linux-rp_2.6.20.bb"
#  from [4543ed5404a5182988a9eead29310aba8694dafc]
#    to [eb1dff546d288eb653bbb9baf68106c2b1af947d]
# 
# patch "packages/linux/linux-rp_2.6.21.bb"
#  from [aa7370a28343ffa48a4725518e97cc7407f2d7d1]
#    to [25dc346e91edc0878c34b927fbdbdba4d7d1317b]
# 
============================================================
--- packages/linux/linux-rp_2.6.20.bb	4543ed5404a5182988a9eead29310aba8694dafc
+++ packages/linux/linux-rp_2.6.20.bb	eb1dff546d288eb653bbb9baf68106c2b1af947d
@@ -1,8 +1,9 @@ DEFAULT_PREFERENCE_poodle = "-99"
 require linux-rp.inc
 
 PR = "r19"
 
 DEFAULT_PREFERENCE_poodle = "-99"
+DEFAULT_PREFERENCE_collie = "1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
============================================================
--- packages/linux/linux-rp_2.6.21.bb	aa7370a28343ffa48a4725518e97cc7407f2d7d1
+++ packages/linux/linux-rp_2.6.21.bb	25dc346e91edc0878c34b927fbdbdba4d7d1317b
@@ -1,9 +1,9 @@ DEFAULT_PREFERENCE_poodle = "-99"
 require linux-rp.inc
 
 PR = "r12"
 
 DEFAULT_PREFERENCE_poodle = "-99"
-DEFAULT_PREFERENCE_collie = "1"
+DEFAULT_PREFERENCE_collie = "-1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046