diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:14:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-13 08:14:13 -0800 |
| commit | ea991f06d851d58268eac6ce5c2152397757c958 (patch) | |
| tree | e789e2d8284cf38aecea4f4a0fd0a4c52157d934 /fs | |
| parent | 170926993a320cd7b53c388e6ffc759de4fac472 (diff) | |
| parent | bb831eb2027c12a740ad4e4ad78f2a0e841ae808 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPVS]: More endianness fixed.
[IPVS]: Compile fix for annotations in userland.
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions