aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-15 14:48:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-15 14:48:40 +0000
commit5f1640713e907f904a1c734c9c50d58344b0ba73 (patch)
tree7be5b67f73b1098d76b6ae9952b2dc7f4d03e18d
parentf4ff833db48282428ddbfe21b359146ac7b10e19 (diff)
downloadupstream-5f1640713e907f904a1c734c9c50d58344b0ba73.tar.gz
upstream-5f1640713e907f904a1c734c9c50d58344b0ba73.tar.bz2
upstream-5f1640713e907f904a1c734c9c50d58344b0ba73.zip
refresh 2.6.28 patches
SVN-Revision: 13654
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch2
4 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
index d55eda6355..6cab67a27a 100644
--- a/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch
@@ -362,7 +362,7 @@
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4017,6 +4017,11 @@ M: jbglaw@lug-owl.de
+@@ -4027,6 +4027,11 @@ M: jbglaw@lug-owl.de
L: linux-kernel@vger.kernel.org
S: Maintained
diff --git a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
index cc16a10f8e..5367de8722 100644
--- a/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch
@@ -824,7 +824,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1910,6 +1910,11 @@ W: http://moinejf.free.fr
+@@ -1911,6 +1911,11 @@ W: http://moinejf.free.fr
L: video4linux-list@redhat.com
S: Maintained
diff --git a/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch b/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
index 9fe19ac710..ee2cf1b312 100644
--- a/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/970-ocf_kbuild_integration.patch
@@ -1,6 +1,6 @@
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -707,6 +707,8 @@ config CRYPTO_ANSI_CPRNG
+@@ -735,6 +735,8 @@ config CRYPTO_ANSI_CPRNG
for cryptographic modules. Uses the Algorithm specified in
ANSI X9.31 A.2.4
diff --git a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
index 162be24f5d..f7924c6b1d 100644
--- a/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/971-ocf_20080917.patch
@@ -88,7 +88,7 @@
/*********************************************************************
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -139,6 +139,7 @@ asmlinkage long sys_dup(unsigned int fil
+@@ -140,6 +140,7 @@ asmlinkage long sys_dup(unsigned int fil
}
return ret;
}