1
0
Fork 0
alistair23-linux/drivers/net/pcmcia
Linus Torvalds 402168cee1 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: (37 commits)
  sky2: Avoid races in sky2_down
  drivers/net/mlx4: Adjust constant
  drivers/net: Move a dereference below a NULL test
  drivers/net: Move a dereference below a NULL test
  connector: maintainer/mail update.
  USB host CDC Phonet network interface driver
  macsonic, jazzsonic: fix oops on module unload
  macsonic: move probe function to .devinit.text
  can: switch carrier on if device was stopped while in bus-off state
  can: restart device even if dev_alloc_skb() fails
  can: sja1000: remove duplicated includes
  New device ID for sc92031 [1088:2031]
  3c589_cs: re-initialize the multicast in the tc589_reset
  Fix error return for setsockopt(SO_TIMESTAMPING)
  netxen: fix thermal check and shutdown
  netxen: fix deadlock on dev close
  netxen: fix context deletion sequence
  net: Micrel KS8851 SPI network driver
  tcp: Use correct peer adr when copying MD5 keys
  tcp: Fix MD5 signature checking on IPv4 mapped sockets
  ...
2009-07-22 09:49:58 -07:00
..
3c574_cs.c 3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card 2009-05-01 19:21:26 -07:00
3c589_cs.c 3c589_cs: re-initialize the multicast in the tc589_reset 2009-07-20 08:26:55 -07:00
Kconfig [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit 2008-10-16 05:40:16 -04:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
axnet_cs.c net: use symbolic values for ndo_start_xmit() return codes 2009-06-13 01:18:50 -07:00
com20020_cs.c netdevice: safe convert to netdev_priv() #part-2 2008-11-12 23:38:14 -08:00
fmvj18x_cs.c net: use symbolic values for ndo_start_xmit() return codes 2009-06-13 01:18:50 -07:00
ibmtr_cs.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
nmclan_cs.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
pcnet_cs.c pcnet_cs: add new id 2009-07-05 18:03:27 -07:00
smc91c92_cs.c net: use symbolic values for ndo_start_xmit() return codes 2009-06-13 01:18:50 -07:00
xirc2ps_cs.c net: use symbolic values for ndo_start_xmit() return codes 2009-06-13 01:18:50 -07:00