diff options
| author | Russell King | 2008-07-12 22:43:01 +0200 |
|---|---|---|
| committer | Russell King | 2008-07-12 22:43:01 +0200 |
| commit | 7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b (patch) | |
| tree | 110d24e6394dbd98cb33d80a5587cd18c8315e0b /net/ipv4/proc.c | |
| parent | Merge branches 'pxa-ian' and 'pxa-xm270' into pxa (diff) | |
| parent | [ARM] 5152/1: Add myself to tosa maintainers list (diff) | |
| download | kernel-qcow2-linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.tar.gz kernel-qcow2-linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.tar.xz kernel-qcow2-linux-7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b.zip | |
Merge branch 'pxa-tosa' into pxa
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'net/ipv4/proc.c')
0 files changed, 0 insertions, 0 deletions