diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:07:03 +0100 |
| commit | c5b970dd2f809ce3675902f672a1d676aed43c7a (patch) | |
| tree | 89311b14d29ab1d8ea2966e22941ac5b2214db25 /arch/arm/kernel/iwmmxt.S | |
| parent | 3bc528d32c5c98a496c3473353e701a6e23c0cb3 (diff) | |
| parent | 892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff) | |
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.9-vexpress
Conflicts:
arch/arm/mach-vexpress/Kconfig
arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'arch/arm/kernel/iwmmxt.S')
0 files changed, 0 insertions, 0 deletions