diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-20 16:40:33 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-20 16:40:33 -0700 |
| commit | 1d1e56d14e6f7118557ee956b12dc7c57255bb73 (patch) | |
| tree | 2867515084b334da43525e27938f87e65b60017d /security/Makefile | |
| parent | 72be63ae1625fcc8d59a066db62fbb5a8dfa3189 (diff) | |
| parent | 0d04279d7443de8a98ced62732d1d834d5f005d5 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/vfp/vfpmodule.c
kernel/power/Kconfig
Diffstat (limited to 'security/Makefile')
0 files changed, 0 insertions, 0 deletions