From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 28 Apr 2007 00:49:50 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.22-rc1~1113
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b9099ff63c75216d6ca10bce5a1abcd9293c27e6;p=~shefty%2Frdma-dev.git

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
---

b9099ff63c75216d6ca10bce5a1abcd9293c27e6