linux-2.6.19+2.6.20-rc4 -> 2.6.20

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1261 311d38ba-8fff-0310-9ca6-ca027cbcb966

22 files changed, 4 insertions, 4 deletions

diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/00-hostap.patch b/meta/packages/linux/linux-rp-2.6.20/00-hostap.patch
index 20432b404a..20432b404a 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/00-hostap.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/00-hostap.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/10-pcnet.patch b/meta/packages/linux/linux-rp-2.6.20/10-pcnet.patch
index 2e1966e837..2e1966e837 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/10-pcnet.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/10-pcnet.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/add-oz-release-string.patch b/meta/packages/linux/linux-rp-2.6.20/add-oz-release-string.patch
index a80a1d5528..a80a1d5528 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/add-oz-release-string.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/add-oz-release-string.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/connectplus-remove-ide-HACK.patch b/meta/packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/connectplus-remove-ide-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/connectplus-remove-ide-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-akita b/meta/packages/linux/linux-rp-2.6.20/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-akita
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-akita
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-c7x0
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-c7x0
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-collie b/meta/packages/linux/linux-rp-2.6.20/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-collie
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-collie
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.20/defconfig-hx2000
index 296c462641..296c462641 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-hx2000
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-hx2000
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-ipaq-pxa270 b/meta/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270
index cb7cce7bdd..cb7cce7bdd 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-ipaq-pxa270
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-ipaq-pxa270
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.20/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-poodle
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-poodle
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm
index e34fe5c090..e34fe5c090 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemuarm
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemuarm
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86
index 6fe280985f..6fe280985f 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-qemux86
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-spitz
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-spitz
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.20/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/defconfig-tosa
+++ b/meta/packages/linux/linux-rp-2.6.20/defconfig-tosa
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/hrw-pcmcia-ids-r5.patch b/meta/packages/linux/linux-rp-2.6.20/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/hrw-pcmcia-ids-r5.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/hrw-pcmcia-ids-r5.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/orinoco-remove-all-which-are-in-hostap-HACK.patch b/meta/packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch
index 380349f809..380349f809 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/orinoco-remove-all-which-are-in-hostap-HACK.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/orinoco-remove-all-which-are-in-hostap-HACK.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/pxa-serial-hack.patch b/meta/packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch
index 9ece71331a..9ece71331a 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/pxa-serial-hack.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/pxa-serial-hack.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/meta/packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/squashfs3.0-2.6.15.patch b/meta/packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch
index 405d4ec124..405d4ec124 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/squashfs3.0-2.6.15.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/squashfs3.0-2.6.15.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/vesafb-tng-1.0-rc2-2.6.20-rc2.patch b/meta/packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
index b1b0fc3549..b1b0fc3549 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
diff --git a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/wm97xx-lcdnoise-r0.patch b/meta/packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/meta/packages/linux/linux-rp-2.6.19+2.6.20-rc4/wm97xx-lcdnoise-r0.patch
+++ b/meta/packages/linux/linux-rp-2.6.20/wm97xx-lcdnoise-r0.patch
diff --git a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb b/meta/packages/linux/linux-rp_2.6.20.bb
index d15141fa53..f0f62c36b2 100644
--- a/meta/packages/linux/linux-rp_2.6.19+2.6.20-rc4.bb
+++ b/meta/packages/linux/linux-rp_2.6.20.bb
@@ -5,6 +5,7 @@ PR = "r1"
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
 # http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2
+# http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2
 # http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1
 # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1
 # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1
@@ -12,9 +13,8 @@ PR = "r1"
 
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2 \
-           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13pre1.patch;patch=1;status=merged \
-           ${RPSRC}/asoc_13pre1_fix-r0.patch;patch=1 \
+SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \
+           http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.patch;patch=1;status=merged \
            ${RPSRC}/hx2750_base-r28.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r8.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -100,4 +100,4 @@ SRC_URI_append_tosa = "\
            file://wm97xx-lcdnoise-r0.patch;patch=1 "
 #          ${DOSRC}/tosa-asoc-r1.patch;patch=1 "
 
-S = "${WORKDIR}/linux-2.6.20-rc4"
+S = "${WORKDIR}/linux-2.6.20"