[oe-commits] org.oe.oz354x linux-oz-2.6: Sync wth .dev, fixing what looks like a merge error

[rpurdie commit]

linux-oz-2.6: Sync wth .dev, fixing what looks like a merge error

Author: rpurdie at openembedded.org
Branch: org.openembedded.oz354x
Revision: 7e95296819f56637752db664af7ede9b0afdd5b9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7e95296819f56637752db664af7ede9b0afdd5b9
Files:
1
packages/linux/linux-openzaurus_2.6.16.bb
Diffs:

#
# mt diff -rd2658c578fc57137cc3475ff80c59f022813df57 -r7e95296819f56637752db664af7ede9b0afdd5b9
#
# 
# 
# patch "packages/linux/linux-openzaurus_2.6.16.bb"
#  from [2e9b26e75be79f74cc883efa4092fa44741c55a4]
#    to [fec6fd09bd88fc7672778f299b569f2346774108]
# 
============================================================
--- packages/linux/linux-openzaurus_2.6.16.bb	2e9b26e75be79f74cc883efa4092fa44741c55a4
+++ packages/linux/linux-openzaurus_2.6.16.bb	fec6fd09bd88fc7672778f299b569f2346774108
@@ -1,6 +1,6 @@ require linux-openzaurus.inc
 require linux-openzaurus.inc
 
-PR = "r43"
+PR = "r44"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -65,12 +65,8 @@ SRC_URI = "http://www.kernel.org/pub/lin
            ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \
            ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \
            ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \
-           ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
-           ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
-           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
-           ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \
-           file://00-hostap.patch;patch=1;status=pending \
-           file://10-pcnet.patch;patch=1;status=pending \
+           file://00-hostap.patch;patch=1;status=merged \
+           file://10-pcnet.patch;patch=1;status=merged \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
            ${RPSRC}/asoc_fixups-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r24.patch;patch=1 \
@@ -82,7 +78,7 @@ SRC_URI = "http://www.kernel.org/pub/lin
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \
+           ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=merged \
            ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \