diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 11:25:51 (GMT) |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 11:25:51 (GMT) |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /arch/arm/mach-ns9xxx | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
| download | linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.xz | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'arch/arm/mach-ns9xxx')
0 files changed, 0 insertions, 0 deletions