aboutsummaryrefslogtreecommitdiff
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2013-11-04 14:48:40 -0800
committerJohn Stultz <john.stultz@linaro.org>2013-11-04 14:48:40 -0800
commit354d86f4daecdc3553830e553f6fc17add736234 (patch)
treef486e22499fc5ce7548b76f299ecb91f52baf8ed /include/linux/mm.h
parenta4b2b620070eb156f75c7d4b276e1acd8b7b3040 (diff)
parentb38c6f06915c69424abb85fbd5c16e418865ed9b (diff)
Merge branch 'linaro-fixes/android-3.10' into linaro-android.3.10-lsk
Merge "official" android-3.10 branch in w/ older experimental/android-3.10 to update lsk targetted branch to the official branch w/o any rebase trouble. Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux/mm.h')
0 files changed, 0 insertions, 0 deletions