diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 18:55:46 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-12 18:55:46 +0200 |
commit | a3620f7545344f932873bf98fbdf416b49409c8e (patch) | |
tree | febf6c9547e5f860d614cc78a55eefe888ad1419 /net/socket.c | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | Remove double removal of blktrace directory (diff) | |
download | linux-a3620f7545344f932873bf98fbdf416b49409c8e.tar.xz linux-a3620f7545344f932873bf98fbdf416b49409c8e.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Remove double removal of blktrace directory
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions