| commit | a8f43ee7e108cecf68cac652d0a3aeedb8131220 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 9 May 2008 15:01:19 +0000 (9 08:01 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 9 May 2008 15:01:19 +0000 (9 08:01 -0700) | ||
| tree | 53ddd1ab32f9146453531e3183654045c57d621f | treesnapshot (tar.gz zip) |
| parent | 91e37a793b5a9436a2d12b2f0a8f52db3a133e1d | commitdiff |
| parent | 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02 | commitdiff |
Merge git://git./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
* 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