From: Linus Torvalds Date: Wed, 26 Oct 2011 14:08:52 +0000 (+0200) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec;p=linux.git Merge git://git./linux/kernel/git/davem/net * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: caif: Fix BUG() with network namespaces net: make bonding slaves honour master's skb->priority net: Unlock sock before calling sk_free() --- 37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec