]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 May 2008 15:01:19 +0000 (08:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 May 2008 15:01:19 +0000 (08:01 -0700)
* 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


Trivial merge