openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/arm
History
Linus Torvalds 06f4e926d2 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: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
 		2011-05-20 13:43:21 -07:00
..
Kconfig ARM: 5865/1: nuc900 ethernet driver needs mii 2010-01-05 20:53:07 +00:00
Makefile Add mac driver for w90p910 2009-07-20 07:45:05 -07:00
am79c961a.c net: am79c961a: Omit private ndo_get_stats function 2010-12-06 13:24:46 -08:00
am79c961a.h am79c961a: Use net_device_stats from struct net_device 2010-08-17 02:32:55 -07:00
at91_ether.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
at91_ether.h
…
ep93xx_eth.c ep93xx_eth: Use net_device_stats from struct net_device 2010-08-19 17:19:04 -07:00
ether1.c ether1: Use net_device_stats from struct net_device 2010-08-19 00:12:38 -07:00
ether1.h ether1: Use net_device_stats from struct net_device 2010-08-19 00:12:38 -07:00
ether3.c ether3: Use net_device_stats from struct net_device 2010-08-19 00:12:38 -07:00
ether3.h ether3: Use net_device_stats from struct net_device 2010-08-19 00:12:38 -07:00
etherh.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
ixp4xx_eth.c net: ixp4xx_eth: Return proper error for eth_init_one 2011-01-06 11:12:01 -08:00
ks8695net.c ethtool: cosmetic: Use ethtool ethtool_cmd_speed API 2011-04-29 14:03:01 -07:00
ks8695net.h net: Add support for the KS8695 ethernet devices. 2008-12-11 21:00:29 -08:00
w90p910_ether.c drivers/net: normalize TX_TIMEOUT 2010-11-09 09:17:56 -08:00