refresh 2.6.28 patches
SVN-Revision: 13654
This commit is contained in:
parent
f4ff833db4
commit
5f1640713e
4 changed files with 4 additions and 4 deletions
|
@ -362,7 +362,7 @@
|
||||||
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
|
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/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
|
L: linux-kernel@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
|
|
@ -824,7 +824,7 @@
|
||||||
+be done automatically.
|
+be done automatically.
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/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
|
L: video4linux-list@redhat.com
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/crypto/Kconfig
|
--- a/crypto/Kconfig
|
||||||
+++ b/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
|
for cryptographic modules. Uses the Algorithm specified in
|
||||||
ANSI X9.31 A.2.4
|
ANSI X9.31 A.2.4
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
--- a/fs/fcntl.c
|
--- a/fs/fcntl.c
|
||||||
+++ b/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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue