merge of 031940b53227ed6076cc3d5e00220f0f9f1013c6

     and 246b163cc5c32e5b08f9265b553ca17e0240e59d

12 files changed, 23 insertions, 18 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch
index 85d07191b9..85d07191b9 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0
index b993f2ac26..b993f2ac26 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle
index 42a851dd5f..42a851dd5f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz
index ed5010d5c8..ed5010d5c8 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa
index c7eba4a337..c7eba4a337 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch
index a2dbce3325..a2dbce3325 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch
index ee761b75ad..ee761b75ad 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb
index 7e7df86702..9df141ed44 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r1"
+PR = "r0"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -19,44 +19,48 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \
 
 #           ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \
+#           ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
+#           ${RPSRC}/w100_core-r1.patch;patch=1 \
+#           ${RPSRC}/w100_corgi-r1.patch;patch=1 \
+#           ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \
+#           ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \
+#           ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \
+#           ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \
+#           ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \
+#           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
+#           ${RPSRC}/mmc_sd-r5.patch;patch=1 \
 
 # Patches submitted upstream are towards top of this list 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
-           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \
-           ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \
-           ${RPSRC}/reverse_pagefault-r0.patch;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc4.bz2;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc4/2.6.13-rc4-mm1/2.6.13-rc4-mm1.bz2;patch=1 \
+           ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \
            ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
            ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
-           ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \
-           ${RPSRC}/w100_core-r1.patch;patch=1 \
-           ${RPSRC}/w100_corgi-r1.patch;patch=1 \
-           ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \
-           ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \
-           ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \
-           ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \
-           ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \
+           ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \
+           ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
+           ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
+           ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \	   
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/pxa_irda-r2.patch;patch=1 \
            ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \
            ${RPSRC}/input_power-r2.patch;patch=1 \
            ${RPSRC}/corgi_irda-r2.patch;patch=1 \
-           ${RPSRC}/corgi_base_extras1-r3.patch;patch=1 \
+           ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/corgi_power-r24.patch;patch=1 \
            ${RPSRC}/corgi_power1-r1.patch;patch=1 \
-           ${RPSRC}/mmc_sd-r5.patch;patch=1 \
            ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/corgi_snd-r8.patch;patch=1 \
            ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
            ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
-           ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \
+           ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
            ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_test1-r1.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
            ${DOSRC}/tosa-detection-r0.patch;patch=1 \
            ${BASRC}/spitz-detection-r0.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
@@ -70,6 +74,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-udc-r3.patch;patch=1 \
            ${DOSRC}/tosa-irda-r2.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
+           ${DOSRC}/tosa-2.6.13-r2.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
            file://add-oz-release-string.patch;patch=1 \