]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit560b7bf973a2d889158bdac42ce1b1f869bcc10e
treeebe4134fcc93a6e205e6004b3e652d7a62281651
parent0dbbd925bd34d383ca762f365f93e5ac7706cf8c
parentc82a6aca073435153651676edfa49233174f93dd
Merge git://git.kernel.org/pub/scm/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