summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 17:14:13 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 17:14:13 +0100
commitea991f06d851d58268eac6ce5c2152397757c958 (patch)
treee789e2d8284cf38aecea4f4a0fd0a4c52157d934 /fs
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff)
parent[IPVS]: More endianness fixed. (diff)
downloadlinux-ea991f06d851d58268eac6ce5c2152397757c958.tar.xz
linux-ea991f06d851d58268eac6ce5c2152397757c958.zip
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