tree 244c167220a1921156cdf24eb19f663f25e9c517
parent 940155309cd037d3a49ad01276e591b872e8a832
parent dc5a144991ba803bc8afded105c9db1dea0e57ab
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1177721390 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1177721390 -0700

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sis900: Allocate rx replacement buffer before rx operation
  usb-net/pegasus: simplify carrier detection