diff options
| author |   Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 11:47:05 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-12-29 11:47:05 +0200 |
| commit | 3c506efd7e0f615bd9603ce8c06bc4a896952599 (patch) | |
| tree | 6ebc840535e9d93bf60e21e940a5f4558275a89d /arch/powerpc/sysdev/fsl_pci.c | |
| parent | Merge branches 'topic/fixes', 'topic/cleanups' and 'topic/documentation' into for-linus (diff) | |
| parent | SLUB: failslab support (diff) | |
| download | linux-rng-3c506efd7e0f615bd9603ce8c06bc4a896952599.tar.xz linux-rng-3c506efd7e0f615bd9603ce8c06bc4a896952599.zip | |
Merge branch 'topic/failslab' into for-linus
Conflicts:
mm/slub.c
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
0 files changed, 0 insertions, 0 deletions