aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-12 12:55:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-12 12:55:46 -0400
commita3620f7545344f932873bf98fbdf416b49409c8e (patch)
treefebf6c9547e5f860d614cc78a55eefe888ad1419 /net/socket.c
parent78efd1ddd95d2fac1ed8d5fadd9dab885ea70e55 (diff)
parent39cbb602b543e477df71dca84b5b2e36f8bd29fc (diff)
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