From 6d74123947016999ae62d9c3067ae97782fdba21 Mon Sep 17 00:00:00 2001
From: Ed Tam <etam@google.com>
Date: Tue, 18 Mar 2014 15:11:14 -0700
Subject: flo: update prebuilt kernel - DO NOT MERGE

03485a6 staging: android: ashmem: Avoid deadlock with mmap/shrink
2e4946a deb: mdm: Implement RESET_CHARM in the ioctl function.

Bug: 13114122
Bug: 11679123

Change-Id: I1253da72daa529540f1223a26f524003128bd75c
Signed-off-by: Ed Tam <etam@google.com>
---
 kernel | Bin 6693008 -> 6722240 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/kernel b/kernel
index 2a30ff0..bb7db81 100644
Binary files a/kernel and b/kernel differ
-- 
cgit v1.2.3