Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 19 Jul 2012 18:17:30 +0000 (11:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Jul 2012 18:17:30 +0000 (11:17 -0700)
commitabaa72d7fd9a20a67b62e6afa0e746e27851dc33
treeebe4134fcc93a6e205e6004b3e652d7a62281651
parent67da22d23fa6f3324e03bcd0580b914b2e4afbf3
parent3e4b9459fb0e149c6b74c9e89399a8fc39a92b44
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
13 files changed:
Documentation/devicetree/bindings/net/fsl-fec.txt
MAINTAINERS
drivers/net/ethernet/intel/e1000e/82571.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/scsi/bnx2i/bnx2i.h
drivers/scsi/bnx2i/bnx2i_hwi.c
drivers/scsi/bnx2i/bnx2i_iscsi.c
net/caif/caif_dev.c
net/core/dev.c
net/core/skbuff.c
net/sctp/input.c
net/sctp/socket.c
security/selinux/hooks.c