diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 11:07:38 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-21 11:07:38 -0500 |
| commit | b80ebbf39fc628afab7d9cf94b84cfc51d845b2f (patch) | |
| tree | 106df5279ca8cb5b978bd4b9b35cfea02fe7ab86 /fs/lockd | |
| parent | e5ffd2bb62c3f2c0d9f34e0d16fab6e2c8b056fb (diff) | |
| parent | 3af9815328bba76e8d11d71d6dbbd6f38beafe58 (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86_64: Align data segment to PAGE_SIZE boundary
[PATCH] x86-64: increase PHB1 split transaction timeout
[PATCH] x86-64: Fix C3 timer test
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions