linux-sg2042/drivers/s390/net
Linus Torvalds f8965467f3 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: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-20 21:04:44 -07:00
..
Kconfig [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00
Makefile [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01: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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09: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 drivers/s390/net: Drop memory allocation cast 2010-05-17 22:42:54 -07:00
ctcm_main.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_mpc.c drivers/s390/net: Drop memory allocation cast 2010-05-17 22:42:54 -07:00
ctcm_mpc.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_sysfs.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fsm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fsm.h ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
lcs.c drivers/s390/net: Drop memory allocation cast 2010-05-17 22:42:54 -07:00
lcs.h 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: support the new OSA CHPID types OSX and OSM 2010-05-17 22:42:55 -07:00
qeth_core_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
qeth_core_mpc.c qeth: support z/VM VSWITCH Port Isolation 2009-05-20 17:36:50 -07:00
qeth_core_mpc.h qeth: support the new OSA CHPID types OSX and OSM 2010-05-17 22:42:55 -07:00
qeth_core_sys.c qeth: support the new OSA CHPID types OSX and OSM 2010-05-17 22:42:55 -07:00
qeth_l2_main.c qeth: support the new OSA CHPID types OSX and OSM 2010-05-17 22:42:55 -07:00
qeth_l3.h qeth: HiperSockets Network Traffic Analyzer 2010-01-13 20:34:55 -08:00
qeth_l3_main.c qeth: support the new OSA CHPID types OSX and OSM 2010-05-17 22:42:55 -07:00
qeth_l3_sys.c qeth: synchronize configuration interface 2010-05-16 00:50:11 -07:00
smsgiucv.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
smsgiucv.h [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00
smsgiucv_app.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00