diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 11:05:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 11:05:20 -0700 |
| commit | 89d8ab6993e1d9f3c482ee8c862c03c528f696aa (patch) | |
| tree | d9adfe3c3d3e640bd5d7cacabef6c18f739fce22 /arch/mips/oprofile/op_model_mipsxx.c | |
| parent | d80a7920731a964b8c3492667a8069e5385ec794 (diff) | |
| parent | 5efb764c8653c187912669629c14bb47242a5d05 (diff) | |
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
Diffstat (limited to 'arch/mips/oprofile/op_model_mipsxx.c')
0 files changed, 0 insertions, 0 deletions