Merge branch 'upstream/linaro.38' into linaro-android.38-test
authorJohn Stultz <john.stultz@linaro.org>
Fri, 20 May 2011 22:29:44 +0000 (15:29 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 20 May 2011 22:29:44 +0000 (15:29 -0700)
commit4c24965e21c2226d2bd3dcd1f81b1b15d2fdf8a9
treeee67e690a0a85413a0274547e7960a744f815c8c
parent5ea756bf0d0fbe2837b81365ea5af978e19bec77
parentc5aa2077c8bae6dcb5fc185b029fc084ec4a5202
Merge branch 'upstream/linaro.38' into linaro-android.38-test
drivers/mmc/core/host.c
drivers/mmc/host/sdhci.c
include/linux/mmc/host.h
include/linux/sched.h