manual merge 0244ecf

Change-Id: I45949323053583fc1c12460061f31eea067e7fa5
diff --git a/bcm4329.ko b/bcm4329.ko
index f51cee4..d2bb012 100644
--- a/bcm4329.ko
+++ b/bcm4329.ko
Binary files differ
diff --git a/kernel b/kernel
index e825933..9f664b0 100644
--- a/kernel
+++ b/kernel
Binary files differ