diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-09-14 12:07:50 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-09-14 12:07:50 -0700 |
| commit | 8e5922b81be9a9548c0cee8ffe3d14bb58b95387 (patch) | |
| tree | 72356bc5d1fe562cb62f9c4d9e0d8fcd44f8b775 /arch/arm/configs/android_origen_defconfig | |
| parent | 3f1fc539a29e09d940df1418b36d23621f85d545 (diff) | |
| parent | f392cbf75615e9d8cb90ef5ffb8d4e752b7be3c7 (diff) | |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/configs/android_origen_defconfig')
0 files changed, 0 insertions, 0 deletions