aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 13:53:40 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 13:53:40 -0800
commit37ef4399a6bb265d3035e6d6e45f7677b132a3ba (patch)
tree31adbac36ea310a44562a335f501d69d5ce2c78c /include/linux/socket.h
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parentdrm: fix issues with systems with no MTRR (diff)
downloadlinux-dev-37ef4399a6bb265d3035e6d6e45f7677b132a3ba.tar.xz
linux-dev-37ef4399a6bb265d3035e6d6e45f7677b132a3ba.zip
Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'include/linux/socket.h')
0 files changed, 0 insertions, 0 deletions