kernel update (mmc timeout fix, f2fs panic on error for real) automerge: dc24a4a  -s ours
automerge: 4c7835c

* commit '4c7835c9b534707ab52b5b0c7b82b56b7ef8f964':
  kernel update (mmc timeout fix, f2fs panic on error for real)
tree: aab80098266990f9353158785f60b8b98aef79a9
  1. Image.gz-dtb