diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-06-23 15:07:52 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-06-23 15:07:52 +0000 |
| commit | 644807d7486779401fd1cdbb5b0aca3808e17ee6 (patch) | |
| tree | 5bfb55781f9d647310e398c4775bfd64571c778b /target/linux/orion | |
| parent | 6d1da1b6611015075d03494b094ca59c6e598d59 (diff) | |
| download | upstream-644807d7486779401fd1cdbb5b0aca3808e17ee6.tar.gz upstream-644807d7486779401fd1cdbb5b0aca3808e17ee6.tar.bz2 upstream-644807d7486779401fd1cdbb5b0aca3808e17ee6.zip | |
upgrade orion to 2.6.26-rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11569 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion')
| -rw-r--r-- | target/linux/orion/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/orion/patches/060-mv643xx_git_backport.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile index 8b18cccb17..22584e006e 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-rc6 +LINUX_VERSION:=2.6.26-rc7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/orion/patches/060-mv643xx_git_backport.patch b/target/linux/orion/patches/060-mv643xx_git_backport.patch index 0b039224d5..76eaddd496 100644 --- a/target/linux/orion/patches/060-mv643xx_git_backport.patch +++ b/target/linux/orion/patches/060-mv643xx_git_backport.patch @@ -5327,7 +5327,7 @@ +#endif --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2689,12 +2689,10 @@ +@@ -2690,12 +2690,10 @@ S: Maintained MARVELL MV643XX ETHERNET DRIVER |