tree 7297279ebe5632c9dc5b9374f133a4bdf4d412dc
parent fd1d3ca6758100e70d95b8d5b84948c39b658946
author Brian Muramatsu <btmura@google.com> 1343759707 -0700
committer The Android Automerger <android-build@android.com> 1343765428 -0700

mako: update prebuilt kernel and wifi

b6b0b65 Add heap_mask to ion_allocation_data

Change-Id: I62125beb7ef5da7468182059fb3613171d9783d6

Conflicts:

	kernel
	prima_wlan.ko