diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-11 18:46:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-11 18:46:59 -0400 |
| commit | d649dafd0713f2f3dfe29baa783868db33aa2c11 (patch) | |
| tree | 219379815f3d658a499f6a1a2971c9e7b14377b7 /fs/nfsd/lockd.c | |
| parent | 2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67 (diff) | |
| parent | 41b11afb048d67cc0e221191191ba0b2012dce47 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3508/1: Update collie defconfig
[ARM] Fix thread struct allocator for SMP case
[ARM] Update mach-types
[ARM] Update versatile_defconfig
Diffstat (limited to 'fs/nfsd/lockd.c')
0 files changed, 0 insertions, 0 deletions