From: John Bowler <jbowler@nslu2-linux.org>
Date: Sun, 5 Feb 2006 06:16:22 +0000 (+0000)
Subject: merge of 755dbf7499934a2404de279fb00043830c15add1
X-Git-Tag: Release-2010-05/1~9453^2~2456^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ef2a3e30af363c4b9ca1e9bae81b1f2df16ce9;p=openembedded.git

merge of 755dbf7499934a2404de279fb00043830c15add1
     and c110ccecd8770f6c3ae49eead02de2c93ffac02b
---

c6ef2a3e30af363c4b9ca1e9bae81b1f2df16ce9
diff --cc packages/linux/ixp4xx-kernel_2.6.15.2.bb
index 90bc6554f0,6881708d37..10163296b6
--- a/packages/linux/ixp4xx-kernel_2.6.15.2.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.2.bb
@@@ -8,7 -8,7 +8,7 @@@ PR_CONFIG = "1
  # Increment the number below (i.e. the digits after PR) when
  # making changes within this file or for changes to the patches
  # applied to the kernel.
- PR = "r1.${PR_CONFIG}"
 -PR = "r0.${PR_CONFIG}"
++PR = "r2.${PR_CONFIG}"
  
  include ixp4xx-kernel.inc
  
diff --cc packages/slugos-init/slugos-init_0.10.bb
index 561f593560,6a31fca367..7c4c21f521
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@@ -4,7 -4,7 +4,7 @@@ PRIORITY = "required
  LICENSE = "GPL"
  DEPENDS = "base-files devio"
  RDEPENDS = "busybox devio"
- PR = "r53"
 -PR = "r52"
++PR = "r54"
  
  SRC_URI = "file://boot/flash \
  	   file://boot/disk \