tree 69d7fe945af6de3bf046f20e389119fe3531a0c1
parent e0f6082cf6f08c180ee2ef9fa90830068ff40804
parent 40cdfe48dbf95d4cef7bbd47bd0c0e72f72bd390
author jp abgrall <jpa@google.com> 1347423209 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347423209 -0700

am 40cdfe48: am 78b00d81: Merge "Don\'t include <linux/...> header files directly."

* commit '40cdfe48dbf95d4cef7bbd47bd0c0e72f72bd390':
  Don't include <linux/...> header files directly.