alistair23-linux/drivers/s390/net
Linus Torvalds d2aa455037 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: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck
2009-06-18 14:07:15 -07:00
..
claw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2009-06-16 12:57:37 -07:00
claw.h [S390] bus_id -> dev_name conversions 2008-10-10 21:33:49 +02: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 ctcm: avoid wraparound in length of incoming data 2009-03-24 15:24:30 -07:00
ctcm_fsms.h ctcm: infrastructure for replaced ctc driver 2008-03-17 07:49:26 -04:00
ctcm_main.c [S390] pm: ctcm driver power management callbacks 2009-06-16 10:31:13 +02:00
ctcm_main.h [S390] convert ctcm printks to dev_xxx and pr_xxx macros. 2008-12-25 13:39:27 +01:00
ctcm_mpc.c ctcm: fix minor findings from code analysis tool 2009-03-24 15:24:31 -07:00
ctcm_mpc.h s390/net/ctcm: message cleanup 2008-07-22 17:53:46 -04:00
ctcm_sysfs.c [S390] convert ctcm printks to dev_xxx and pr_xxx macros. 2008-12-25 13:39:27 +01:00
cu3088.c s390: remove s390_root_dev_*() 2009-01-06 10:44:34 -08:00
cu3088.h [S390] Remove P390 support. 2008-07-14 10:02:25 +02:00
fsm.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
fsm.h [PATCH] s390: Remove CVS generated information 2006-02-01 08:53:23 -08:00
Kconfig trivial: Kconfig: .ko is normally not included in module names 2009-06-12 18:01:50 +02:00
lcs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2009-06-16 12:57:37 -07:00
lcs.h s390: remove driver_data direct access of struct device 2009-06-15 21:30:28 -07:00
Makefile qeth: remove EDDP 2009-03-25 00:06:21 -07:00
netiucv.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2009-06-16 12:57:37 -07:00
qeth_core.h qeth: remove EDDP 2009-03-25 00:06:21 -07:00
qeth_core_main.c [S390] pm: qeth driver power management callbacks 2009-06-16 10:31:13 +02: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 z/VM VSWITCH Port Isolation 2009-05-20 17:36:50 -07:00
qeth_core_sys.c qeth: remove EDDP 2009-03-25 00:06:21 -07:00
qeth_l2_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-06-18 14:07:15 -07:00
qeth_l3.h qeth module size reduction. 2008-04-29 01:56:30 -04:00
qeth_l3_main.c [S390] pm: qeth driver power management callbacks 2009-06-16 10:31:13 +02:00
qeth_l3_sys.c qeth: remove unnecessary support ckeck in sysfs route6 2008-10-27 14:48:53 -04:00
smsgiucv.c [S390] pm: smsgiucv power management callbacks. 2009-06-16 10:31:20 +02:00
smsgiucv.h [PATCH] s390: cmm guest sender id 2005-05-01 08:58:58 -07:00