aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 16:20:37 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-27 16:20:37 -0700
commit42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch)
tree94836c3535cf7e972cdc2ea65598fa2182b20fa3 /drivers
parentf00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff)
parentb8b8fd2dc23725fba77f66b3fef11b11f983fc08 (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: [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 'drivers')
0 files changed, 0 insertions, 0 deletions