Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 14 Aug 2007 16:30:42 +0000 (09:30 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 14 Aug 2007 16:30:42 +0000 (09:30 -0700)
commitc4e7ac5d427a48b91752671523f39a04e63e12ff
tree72168de27e0211c1714e1b0073b8640de85a5f6f
parentc019b1933015ee31366eeaa085bad3ee9516991c
parentce57a02c64052c3f1c62f30a902a937e6c316d88
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:
  e1000: Add device IDs of new 82571 board variants
  xen-netfront: Avoid deref'ing skbafter it is potentially freed.
  3c59x maintainer
  3c59x: fix duplex configuration
  natsemi: fix netdev error acounting
  ax88796 printk fixes
  myri10ge: Use the pause counter to avoid a needless device reset
  via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access