am 04a7df0c: am 591ea1e1: Merge "Label gps fifos correctly on restorecon."

* commit '04a7df0cc6f6aa7068be848880eb684585ca121a':
  Label gps fifos correctly on restorecon.
diff --git a/bcmdhd.cal b/bcmdhd.cal
index bceb98b..ff38d0b 100644
--- a/bcmdhd.cal
+++ b/bcmdhd.cal
@@ -17,8 +17,8 @@
 rxchain=0x3
 aa2g=3
 aa5g=3
-ccode=EU
-regrev=57
+ccode=Q2
+regrev=32
 pa2gw0a0=0xFFB9
 pa2gw1a0=0x12AC
 pa2gw2a0=0xFED9
diff --git a/factory-images/generate-factory-images-package.sh b/factory-images/generate-factory-images-package.sh
index 8968660..8be8229 100755
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -36,11 +36,11 @@
 # end jb-mr2-dev
 
 source ../../../common/clear-factory-images-variables.sh
-BUILD=737497
+BUILD=937116
 DEVICE=manta
 PRODUCT=mantaray
-VERSION=jwr66v
+VERSION=kot49h
 SRCPREFIX=signed-
-BOOTLOADER=mantamd03
+BOOTLOADER=mantamf01
 ERASEALL=true
 source ../../../common/generate-factory-images-common.sh
diff --git a/kernel b/kernel
index 023bc0d..6170736 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 02a7176..f4d69e3 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -63,8 +63,8 @@
 fi # jb-mr2-dev
 if test $BRANCH = klp-dev
 then
-  ZIP=mantaray-ota-882444
-  BUILD=882444
+  ZIP=mantaray-ota-937116
+  BUILD=kot49h
 fi # klp-dev
 ROOTDEVICE=manta
 DEVICE=manta