summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-11-13 13:46:01 +0000
committerRod Whitby <rod@whitby.id.au>2006-11-13 13:46:01 +0000
commit033cd72ff9e485ba8b098392e10b8ee23e82f21d (patch)
tree8db77bc8a7241390e7bf1a086e066542e70f2869
parente6117e46921a823fea45cbb549614e73f5e5b5ee (diff)
parent180d16954affcf1893e447eaa984e35411227188 (diff)
merge of '1f8bedd057ba33e70fd11091f9d542d6c680cd02'
and '8345565aba9dd2a72e19d84ff810f1df2f41789b'
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19-rc5.bb2
-rw-r--r--packages/slugimage/slugimage.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
index 77169461aa..bfb9dccb80 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc5.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "574"
+IXP4XX_KERNEL_SVN_REV = "577"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index ab61c71927..d553a21777 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
LICENSE = "BSD"
DESCRIPTION = "Slugimage is a small app to disassemble and reassemble \
flash images for the Linksys NSLU2 device. It also has jffs2 support"
-PR = "r5"
+PR = "r6"
RDEPENDS = "perl"