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
commit1412a1d4099e8207958b6855c1c0d677fa8f94ed (patch)
treef3401e9ac0c66189eb41e40254b18194306ddf03 /target/linux
parent0edc0ce1e7305bbaeeed592a5816bb59aebf6578 (diff)
downloadupstream-1412a1d4099e8207958b6855c1c0d677fa8f94ed.tar.gz
upstream-1412a1d4099e8207958b6855c1c0d677fa8f94ed.tar.bz2
upstream-1412a1d4099e8207958b6855c1c0d677fa8f94ed.zip
upgrade orion to 2.6.26-rc9
SVN-Revision: 11818
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