tree 94836c3535cf7e972cdc2ea65598fa2182b20fa3
parent f00546363fff1576ceddc2690d47e5f9c1dd2e05
parent b8b8fd2dc23725fba77f66b3fef11b11f983fc08
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177716037 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177716037 -0700

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.