From: David S. Miller <davem@davemloft.net>
Date: Mon, 2 Aug 2010 22:07:58 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=83bf2e4089bebc2c7fd14a79de5954b26fe8d4af;p=linux-edison.git

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

83bf2e4089bebc2c7fd14a79de5954b26fe8d4af