merge in klp-factoryrom-release history after reset to klp-release
diff --git a/kernel b/kernel
index c2d22da..6edd91b 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/nfc/libnfc-brcm.conf b/nfc/libnfc-brcm.conf
index 7cc236e..d5d0300 100644
--- a/nfc/libnfc-brcm.conf
+++ b/nfc/libnfc-brcm.conf
@@ -131,13 +131,7 @@
# SE that is detected by the stack. This value might be used when the phone
# supports multiple SE (e.g. 0xF3 and 0xF4) but you want to force it to use
# one of them (e.g. 0xF4).
-ACTIVE_SE=0xF4
-
-###############################################################################
-# Configure the default NfcA/IsoDep techology and protocol route. Can be
-# either a secure element (e.g. 0xF4) or the host (0x00)
-DEFAULT_ISODEP_ROUTE=0x00
-
+ACTIVE_SE=0x00
###############################################################################
# Configure the NFC Extras to open and use a static pipe. If the value is
