]> nv-tegra.nvidia Code Review - linux-3.10.git/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 02:31:54 +0000 (19:31 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 02:31:54 +0000 (19:31 -0700)
commit4fa4d23fa20de67df919030c1216295664866ad7
tree90e80f8a40665a351950ef25ab9de85b3647a23a
parenta9e82d3a02247af6b729be0a963862d70cb25bf9
parent4f1e5ba0977570b7a198bb3ac110ccc5f532821b
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  pcnet32: remove private net_device_stats structure
  vortex_up should initialize "err"
  pcnet32: remove compile warnings in non-napi mode
  pcnet32: fix non-napi packet reception
  fix EMAC driver for proper napi_synchronize API
  sky2: shutdown cleanup
  napi_synchronize: waiting for NAPI
  forcedeth msi bugfix
  gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
  fs_enet: Update for API changes
  gianfar: remove orphan struct.
  forcedeth: fix rx-work condition in nv_rx_process_optimized() too
drivers/net/sky2.c
include/linux/netdevice.h