Linux v4.6-rc6-113-g83858a701cf3

- Enable NFC_NXP_NCI options (rhbz 1290556)

4 files changed, 8 insertions, 5 deletions

diff --git a/config-generic b/config-generic
index 344d8f5dc..4a5879d23 100644
--- a/config-generic
+++ b/config-generic
@@ -2112,7 +2112,8 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST95HF is not set
-# CONFIG_NFC_NXP_NCI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
 # CONFIG_NFC_NCI_SPI is not set
 # CONFIG_NFC_NCI_UART is not set
 # CONFIG_NFC_ST_NCI is not set
diff --git a/gitrev b/gitrev
index 8e91b6a10..c1812aca9 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-33656a1f2ee5346c742d63ddd0e0970c95a56b70
+83858a701cf3271f81dd321c2a81e5666c6ca8f4
diff --git a/kernel.spec b/kernel.spec
index 75c7f36b1..baa9cb284 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -2148,7 +2148,9 @@ fi
 #
 # 
 %changelog
-* Wed May 04 2016 Josh Boyer <jwboyer@fedoraproject.org>
+* Wed May 04 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc6.git2.1
+- Linux v4.6-rc6-113-g83858a701cf3
+- Enable NFC_NXP_NCI options (rhbz 1290556)
 - CVE-2016-4482 info leak in devio.c (rhbz 1332931 1332932)
 
 * Tue May 03 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc6.git1.1
diff --git a/sources b/sources
index 9b54d47fe..7b077131c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 a60d48eee08ec0536d5efb17ca819aef  linux-4.5.tar.xz
 6f557fe90b800b615c85c2ca04da6154  perf-man-4.5.tar.gz
 60d2e4b5eeb4ff2b58cf85a03d9c6a4b  patch-4.6-rc6.xz
-063112de26c683696a572a53ff3a4eff  patch-4.6-rc6-git1.xz
+ee95432f3a9c91f9a5cd4092756d216f  patch-4.6-rc6-git2.xz