tuna kernel needs merge

[Joshua Brindle]

With the newest maguro and toro blobs SurfaceFlinger dies on start in
master. Merging android-omap-tuna-3.0-jb-mr1.1 corrected it for me.