From: David S. Miller <davem@davemloft.net>
Date: Fri, 16 Nov 2012 17:42:43 +0000 (-0500)
Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~305
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=545b29019c8959c805abfe8194d47e989f1a6e5f;p=pandora-kernel.git

Merge branch 'master' of git://1984.lsi.us.es/nf-next

Conflicts:
	net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

Minor conflict due to some IS_ENABLED conversions done
in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

545b29019c8959c805abfe8194d47e989f1a6e5f
Reading git-diff-tree failed