From: David S. Miller <davem@davemloft.net>
Date: Thu, 13 May 2010 21:14:10 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e7874c996b8591f59d78efa519031dab5b58723b;p=linux-beck.git

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

e7874c996b8591f59d78efa519031dab5b58723b