summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-28 01:20:37 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-28 01:20:37 +0200
commit42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch)
tree94836c3535cf7e972cdc2ea65598fa2182b20fa3 /.mailmap
parentMerge git://git.infradead.org/mtd-2.6 (diff)
parent[NET]: Fix networking compilation errors (diff)
downloadlinux-42fae7fb1c27d230fbd48aa055a4ae6796fb0039.tar.xz
linux-42fae7fb1c27d230fbd48aa055a4ae6796fb0039.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: [NET]: Fix networking compilation errors [AF_RXRPC/AFS]: Arch-specific fixes. [AFS]: Fix VLocation record update wakeup [NET]: Revert sk_buff walker cleanups.
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions