diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-31 05:03:50 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-31 05:03:50 +0200 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /fs/xfs/quota/xfs_qm.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | Merge branch 'linus' into cpumask-for-linus (diff) | |
| download | linux-558f6ab9106e6be701acb0257e7171df1bbccf04.tar.xz linux-558f6ab9106e6be701acb0257e7171df1bbccf04.zip | |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'fs/xfs/quota/xfs_qm.h')
0 files changed, 0 insertions, 0 deletions