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
+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
--- 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
/*********************************************************************
--- 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;
}