diff options
| author | Rusty Russell | 2008-12-31 13:35:57 +0100 |
|---|---|---|
| committer | Rusty Russell | 2008-12-31 13:35:57 +0100 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /kernel/kmod.c | |
| parent | cpumask: Use nr_cpu_ids in seq_cpumask (diff) | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | kernel-qcow2-linux-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.tar.gz kernel-qcow2-linux-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.tar.xz kernel-qcow2-linux-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'kernel/kmod.c')
0 files changed, 0 insertions, 0 deletions