diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /Documentation/vm/slub.txt | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'Documentation/vm/slub.txt')
| -rw-r--r-- | Documentation/vm/slub.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 7c13f22a0c9e..bb1f5c6e28b3 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
| @@ -266,4 +266,4 @@ of other objects. | |||
| 266 | 266 | ||
| 267 | slub_debug=FZ,dentry | 267 | slub_debug=FZ,dentry |
| 268 | 268 | ||
| 269 | Christoph Lameter, <clameter@sgi.com>, May 30, 2007 | 269 | Christoph Lameter, May 30, 2007 |