adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
aha/drivers/net/mlx4
History
Linus Torvalds d7e9660ad9 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: (1623 commits)
  netxen: update copyright
  netxen: fix tx timeout recovery
  netxen: fix file firmware leak
  netxen: improve pci memory access
  netxen: change firmware write size
  tg3: Fix return ring size breakage
  netxen: build fix for INET=n
  cdc-phonet: autoconfigure Phonet address
  Phonet: back-end for autoconfigured addresses
  Phonet: fix netlink address dump error handling
  ipv6: Add IFA_F_DADFAILED flag
  net: Add DEVTYPE support for Ethernet based devices
  mv643xx_eth.c: remove unused txq_set_wrr()
  ucc_geth: Fix hangs after switching from full to half duplex
  ucc_geth: Rearrange some code to avoid forward declarations
  phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
  drivers/net/phy: introduce missing kfree
  drivers/net/wan: introduce missing kfree
  net: force bridge module(s) to be GPL
  Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
  ...

Fixed up trivial conflicts:

 - arch/x86/include/asm/socket.h

   converted to <asm-generic/socket.h> in the x86 tree.  The generic
   header has the same new #define's, so that works out fine.

 - drivers/net/tun.c

   fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that
   switched over to using 'tun->socket.sk' instead of the redundantly
   available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
   to the TUN driver") which added a new 'tun->sk' use.

   Noted in 'next' by Stephen Rothwell.
2009-09-14 10:37:28 -07:00
..
alloc.c
catas.c
cmd.c
cq.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
en_cq.c
en_ethtool.c
en_main.c mlx4_en: Using real number of rings as RSS map size 2009-08-06 19:27:51 -07:00
en_netdev.c mlx4_en: Not using Shared Receive Queues 2009-08-06 19:28:18 -07:00
en_port.c
en_port.h
en_resources.c mlx4_en: Not using Shared Receive Queues 2009-08-06 19:28:18 -07:00
en_rx.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-08-12 17:44:53 -07:00
en_tx.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-09-02 00:32:56 -07:00
eq.c mlx4_core: Distinguish multiple devices in /proc/interrupts 2009-09-05 20:24:50 -07:00
fw.c
fw.h
icm.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
icm.h
intf.c
main.c mlx4_core: Avoid double free_icms 2009-09-05 20:24:49 -07:00
Makefile
mcg.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
mlx4.h mlx4_core: Allocate and map sufficient ICM memory for EQ context 2009-09-05 20:24:49 -07:00
mlx4_en.h netdev: convert bulk of drivers to netdev_tx_t 2009-09-01 01:14:07 -07:00
mr.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
pd.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
port.c
profile.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
qp.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
reset.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00
sense.c
srq.c mlx4_core: Remove unnecessary includes of <linux/init.h> 2009-09-05 20:24:49 -07:00