diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 06:25:37 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-31 06:25:37 -1000 |
| commit | 6581058f44533f9d45548bcfe986c125376859e9 (patch) | |
| tree | a5c811ace1fea5bccfbc5146048b5d2b3655bdcf /fs/nfs | |
| parent | fa9d594c46679485c5e3642d2bd9e874a7e07b19 (diff) | |
| parent | eacbbae385bf492229e84024863960d3160547c7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: use NUMA_NO_NODE
slab: remove one NR_CPUS dependency
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions