OpenCloudOS-Kernel/drivers/net/fs_enet
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 fs_enet: Add support for MPC512x to fs_enet driver 2010-02-27 02:34:35 -08:00
Makefile fs_enet: Remove !CONFIG_PPC_CPM_NEW_BINDING code 2008-07-16 17:57:49 -05:00
fec.h
fs_enet-main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
fs_enet.h fs_enet: Add support for MPC512x to fs_enet driver 2010-02-27 02:34:35 -08:00
mac-fcc.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
mac-fec.c powerpc: Fix multicast problem in fs_enet driver 2011-04-21 16:59:30 -07:00
mac-scc.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
mii-bitbang.c dt/net: Eliminate users of of_platform_{,un}register_driver 2011-02-28 13:22:44 -07:00
mii-fec.c drivercore: revert addition of of_match to struct device 2011-05-18 12:32:23 -06:00