From: David S. Miller <davem@davemloft.net>
Date: Wed, 2 Feb 2011 23:52:23 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4;p=linux-edison.git

Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
---

0bc0be7f20efea664b7c4c1d0b1822bc8f53a8b4