linux-sg2042/drivers/scsi/bnx2i
Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David
2010-10-23 11:47:02 -07:00
..
57xx_iscsi_constants.h cnic: Defer iscsi connection cleanup 2010-10-14 10:45:54 -07:00
57xx_iscsi_hsi.h [SCSI] bnx2i: Add bnx2i iSCSI driver. 2009-06-09 10:22:45 -05:00
Kconfig scsi: fix bnx2i build errors 2010-08-11 08:59:01 -07:00
Makefile [SCSI] bnx2i: Add bnx2i iSCSI driver. 2009-06-09 10:22:45 -05:00
bnx2i.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
bnx2i_hwi.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
bnx2i_init.c [SCSI] bnx2i: Updated version to bnx2i-2.1.3 2010-09-05 14:51:16 -03:00
bnx2i_iscsi.c [SCSI] bnx2i: Added chip cleanup for the remove module path 2010-09-05 14:51:16 -03:00
bnx2i_sysfs.c [SCSI] bnx2i: Add bnx2i iSCSI driver. 2009-06-09 10:22:45 -05:00