Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 18:05:20 +0000 (11:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 18:05:20 +0000 (11:05 -0700)
commit89d8ab6993e1d9f3c482ee8c862c03c528f696aa
treed9adfe3c3d3e640bd5d7cacabef6c18f739fce22
parentd80a7920731a964b8c3492667a8069e5385ec794
parent5efb764c8653c187912669629c14bb47242a5d05
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:
  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