diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 20:49:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 20:49:50 -0400 |
| commit | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (patch) | |
| tree | 244c167220a1921156cdf24eb19f663f25e9c517 /kernel/hrtimer.c | |
| parent | 940155309cd037d3a49ad01276e591b872e8a832 (diff) | |
| parent | dc5a144991ba803bc8afded105c9db1dea0e57ab (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:
sis900: Allocate rx replacement buffer before rx operation
usb-net/pegasus: simplify carrier detection
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions