diff options
| author | Russell King | 2009-03-28 21:30:18 +0100 |
|---|---|---|
| committer | Russell King | 2009-03-28 21:30:18 +0100 |
| commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /arch/arm/mach-pxa/pxa300.c | |
| parent | Merge branch 'origin' into devel (diff) | |
| parent | [ARM] 5435/1: fix compile warning in sanity_check_meminfo() (diff) | |
| download | kernel-qcow2-linux-9759d22c8348343b0da4e25d6150c41712686c14.tar.gz kernel-qcow2-linux-9759d22c8348343b0da4e25d6150c41712686c14.tar.xz kernel-qcow2-linux-9759d22c8348343b0da4e25d6150c41712686c14.zip | |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'arch/arm/mach-pxa/pxa300.c')
0 files changed, 0 insertions, 0 deletions