1
0
Fork 0
alistair23-linux/drivers/s390
Linus Torvalds 0191b625ca 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: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
2008-12-28 12:49:40 -08:00
..
block [S390] convert dcssblk and extmem printks messages to pr_xxx macros. 2008-12-25 13:39:23 +01:00
char [S390] convert vmlogrdr printks to pr_xxx macros. 2008-12-25 13:39:26 +01:00
cio [S390] convert cio printks to pr_xxx macros. 2008-12-25 13:39:20 +01:00
crypto [S390] convert ap_bus printks to pr_xxx macros. 2008-12-25 13:39:24 +01:00
kvm [S390] kvm_s390: Fix oops in virtio device detection with "mem=" 2008-11-14 18:18:52 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2008-12-28 12:49:40 -08:00
scsi [S390] convert zfcp printks to pr_xxx macros. 2008-12-25 13:39:27 +01:00
Makefile s390: KVM guest: virtio device support, and kvm hypercalls 2008-04-27 12:00:51 +03:00
ebcdic.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
s390_rdev.c [S390] bus_id -> dev_set_name() changes 2008-10-10 21:33:50 +02:00
s390mach.c [S390] stp support. 2008-07-14 10:02:09 +02:00
s390mach.h [S390] stp support. 2008-07-14 10:02:09 +02:00
sysinfo.c [S390] service level interface. 2008-12-25 13:39:00 +01:00