aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/orion
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-09-26 18:46:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-09-26 18:46:53 +0000
commit821170133fc75f42c73b4d11761d798eae7e4733 (patch)
tree46681f18f733797b93dcddf710bc8d1ab9c4a079 /target/linux/orion
parent6f98e7cf01458f9deca4c99e47ad4578efcaf04e (diff)
downloadupstream-821170133fc75f42c73b4d11761d798eae7e4733.tar.gz
upstream-821170133fc75f42c73b4d11761d798eae7e4733.tar.bz2
upstream-821170133fc75f42c73b4d11761d798eae7e4733.zip
update to 2.6.26.5 and 2.6.25.17
SVN-Revision: 12718
Diffstat (limited to 'target/linux/orion')
-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 7fc961cd96..0f7064ae14 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.3
+LINUX_VERSION:=2.6.26.5
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 335c996c98..4daef75d5b 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
-@@ -2686,12 +2686,10 @@
+@@ -2691,12 +2691,10 @@
S: Maintained
MARVELL MV643XX ETHERNET DRIVER