]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 28 Apr 2007 00:49:50 +0000 (17:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 28 Apr 2007 00:49:50 +0000 (17:49 -0700)
* '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


Trivial merge