From 9de9cad929fbcf50aed0eedac8e54208f1f306a4 Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Fri, 9 Mar 2012 12:46:33 -0800
Subject: new kernel prebuilt

includes:
2c7c24b Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
14d4f82 Merge branch 'linux-omap-3.0' into android-omap-3.0
76e33c3 gpu: pvr: Update to DDK 1.8@840215
78149c2 gpu: pvr: Update to DDK 1.8@813213

Change-Id: I441bc22442b4095364d4b60a37a1490f2cd16928
Signed-off-by: Erik Gilling <konkers@android.com>
---
 kernel | Bin 4072980 -> 4073268 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/kernel b/kernel
index 21e5f05..3c5c6fe 100644
Binary files a/kernel and b/kernel differ
-- 
cgit v1.1


From 764ea44f49cf5b882f8c360c3a6ae35f01fe7bec Mon Sep 17 00:00:00 2001
From: Dmitry Shmidt <dimitrysh@google.com>
Date: Thu, 29 Mar 2012 12:56:08 -0700
Subject: tuna: kernel prebuilt

c6aff6c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
64493d1 ARM: omap: tuna: Add CONFIG_DHD_ENABLE_P2P option
a1d5de5 Merge branch 'android-3.0' into android-omap-3.0
f764be6 net: wireless: bcmdhd: Fix crash in dhd_preinit_ioctls() band set
54ba9e6 net: wireless: bcmdhd: Add CONFIG_DHD_ENABLE_P2P Kconfig option

Change-Id: Ifb48b0a63ac3467cc4918976a8f9b9af7c2ff508
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 kernel | Bin 4117888 -> 4117692 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/kernel b/kernel
index 593dd2b..4e5bf56 100644
Binary files a/kernel and b/kernel differ
-- 
cgit v1.1


From b74801dc22bb4945ddf79b2e12e6328a862d68c3 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 3 Apr 2012 17:29:15 -0700
Subject: Remove keystore.tuna.so from product build

The driver has a power usage bug, so remove this from the device build
for now.

Bug: 6277753
Change-Id: Iaa27eaafc3764fb91cd2055028979c8ea74f035f
---
 CleanSpec.mk | 1 +
 device.mk    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index cff019a..51b1305 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -50,3 +50,4 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/phone_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/updatecmds/migrate_nfc.txt)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/keystore.tuna.so)
diff --git a/device.mk b/device.mk
index 8db5e82..f6e49e6 100644
--- a/device.mk
+++ b/device.mk
@@ -58,8 +58,8 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	tuna_hdcp_keys
 
-PRODUCT_PACKAGES += \
-	keystore.tuna
+#PRODUCT_PACKAGES += \
+#	keystore.tuna
 
 PRODUCT_COPY_FILES += \
 	$(LOCAL_KERNEL):kernel \
-- 
cgit v1.1