aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-07-14 01:07:25 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-07-14 01:07:25 +0000
commit2f187b38a1a9aeac641f33c64234ba00427cf99c (patch)
tree60f176d7ce923e6dc9a3626618b0f3bb1173d710 /target/linux
parent7597ac6d7d2c3934cde630588868f3ba25c49dd9 (diff)
downloadupstream-2f187b38a1a9aeac641f33c64234ba00427cf99c.tar.gz
upstream-2f187b38a1a9aeac641f33c64234ba00427cf99c.tar.bz2
upstream-2f187b38a1a9aeac641f33c64234ba00427cf99c.zip
upgrade orion to 2.6.26-rc9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11818 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/orion/patches/000-orion_git_sync.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 74a9cadd13..1ea2545c8c 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -11,7 +11,7 @@ BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26-rc8
+LINUX_VERSION:=2.6.26-rc9
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/orion/patches/000-orion_git_sync.patch b/target/linux/orion/patches/000-orion_git_sync.patch
index 17297c81f5..335c996c98 100644
--- a/target/linux/orion/patches/000-orion_git_sync.patch
+++ b/target/linux/orion/patches/000-orion_git_sync.patch
@@ -1,6 +1,6 @@
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2690,12 +2690,10 @@
+@@ -2686,12 +2686,10 @@
S: Maintained
MARVELL MV643XX ETHERNET DRIVER