tree 53ddd1ab32f9146453531e3183654045c57d621f
parent 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d
parent 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02
author Linus Torvalds <torvalds@linux-foundation.org> 1210345279 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210345279 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sit: Add missing kfree_skb() on pskb_may_pull() failure.
  tipc: Increase buffer header to support worst-case device