linux/drivers/s390/net
Linus Torvalds 597d8c7178 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
  sky2: Fix oops in sky2_xmit_frame() after TX timeout
  Documentation/3c509: document ethtool support
  af_packet: Don't use skb after dev_queue_xmit()
  vxge: use pci_dma_mapping_error to test return value
  netfilter: ebtables: enforce CAP_NET_ADMIN
  e1000e: fix and commonize code for setting the receive address registers
  e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value
  e1000e: perform 10/100 adaptive IFS only on parts that support it
  e1000e: don't accumulate PHY statistics on PHY read failure
  e1000e: call pci_save_state() after pci_restore_state()
  netxen: update version to 4.0.72
  netxen: fix set mac addr
  netxen: fix smatch warning
  netxen: fix tx ring memory leak
  tcp: update the netstamp_needed counter when cloning sockets
  TI DaVinci EMAC: Handle emac module clock correctly.
  dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips
  ixgbe: Fix compiler warning about variable being used uninitialized
  netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq()
  mv643xx_eth: don't include cache padding in rx desc buffer size
  ...

Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c
2010-01-12 20:53:29 -08:00
..
claw.c claw: use "claw" as root device name 2010-01-07 00:27:07 -08:00
claw.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_dbug.c s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_dbug.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_fsms.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_fsms.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_main.c net/s390 drivers: add missing 'const' attribute 2009-11-17 06:47:02 -08:00
ctcm_main.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_mpc.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_mpc.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_sysfs.c s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
fsm.c ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
fsm.h ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
Kconfig trivial: Kconfig: .ko is normally not included in module names 2009-06-12 18:01:50 +02:00
lcs.c net/s390 drivers: add missing 'const' attribute 2009-11-17 06:47:02 -08:00
lcs.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
Makefile s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
netiucv.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
qeth_core.h qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_core_main.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_core_mpc.c qeth: support z/VM VSWITCH Port Isolation 2009-05-20 17:36:50 -07:00
qeth_core_mpc.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
qeth_core_sys.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_l2_main.c qeth: rework TSO functions 2009-11-16 02:42:08 -08:00
qeth_l3.h qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
qeth_l3_main.c qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
qeth_l3_sys.c qeth: allow dynamic change of rx checksumming 2009-11-16 02:42:09 -08:00
smsgiucv.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
smsgiucv.h