summaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 23:00:27 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-28 23:00:27 +0200
commitc203b33d2ee34594f6656c033cddd4f5860eb06c (patch)
treeb59fec34142a6d99df85a0d3576bdf7249308e07 /kernel/printk.c
parentMerge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff)
parent[DCCP] getsockopt: Fix DCCP_SOCKOPT_[SEND,RECV]_CSCOV (diff)
downloadlinux-c203b33d2ee34594f6656c033cddd4f5860eb06c.tar.xz
linux-c203b33d2ee34594f6656c033cddd4f5860eb06c.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [DCCP] getsockopt: Fix DCCP_SOCKOPT_[SEND,RECV]_CSCOV
Diffstat (limited to 'kernel/printk.c')
0 files changed, 0 insertions, 0 deletions