diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-21 19:52:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-21 19:52:40 -0400 |
| commit | 5cfc35cf79d46af998346e3d5cc66fa344d1af0e (patch) | |
| tree | bdaa46ddd39243df9bf74d02a2046ebb8901c720 /net/dccp/ipv4.c | |
| parent | f8829caee311207afbc882794bdc5aa0db5caf33 (diff) | |
| parent | cb01fc720c629261b9c616b2d5fcc3d93cd8bb09 (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86-64: increase PHB1 split transaction timeout
[PATCH] x86-64: Fix C3 timer test
Diffstat (limited to 'net/dccp/ipv4.c')
0 files changed, 0 insertions, 0 deletions