]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Oct 2007 19:04:29 +0000 (12:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Oct 2007 19:04:29 +0000 (12:04 -0700)
commit71d00feca2598c68186ca5b83247746d6a7fed7e
treefe129bfc6a69ea00a43ceffdd04ad91898a0411e
parent8c1ee54cb3ff750dc39a5e1db8075e2352bbd1b8
parent19abe86d60eeb34c5deeb3ab2d14229fa9f59157
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  ixgb: fix TX hangs under heavy load
  e1000e: Fix typo ! &
  ixgbe: minor sparse fixes
  e1000: sparse warnings fixes
  ixgb: fix sparse warnings
  e1000e: fix sparse warnings
  mv643xx_eth: Fix MV643XX_ETH offsets used by Pegasos 2
  Blackfin EMAC driver: Fix Ethernet communication bug (dupliated and lost packets)
  DM9601: Support for ADMtek ADM8515 NIC