tree 2d374846712b0bdacc5dd0a36b3c2f754886e560
parent b65f63ee845136940db985f3072335d8cdb6fd6c
parent 41a00f7950a6bc0aa956f6d6b423f0fbf34d431a
author David S. Miller <davem@davemloft.net> 1377549428 -0400
committer David S. Miller <davem@davemloft.net> 1377549428 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

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