From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 24 Apr 2007 18:05:20 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.21~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=89d8ab6993e1d9f3c482ee8c862c03c528f696aa;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:
  drivers/net/hamradio/baycom_ser_fdx build fix
  usb-net/pegasus: fix pegasus carrier detection
  sis900: Allocate rx replacement buffer before rx operation
  [netdrvr] depca: handle platform_device_add() failure
---

89d8ab6993e1d9f3c482ee8c862c03c528f696aa