summaryrefslogtreecommitdiffstats
path: root/net/rose/rose_link.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 20:52:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 20:52:48 +0200
commitf16393776fc133d95fe3b3ba7118df579ed90af5 (patch)
treee68d277816962511fa873e658e463948def02c3d /net/rose/rose_link.c
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parent[S390] Update default configuration. (diff)
downloadlinux-f16393776fc133d95fe3b3ba7118df579ed90af5.tar.xz
linux-f16393776fc133d95fe3b3ba7118df579ed90af5.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] nss: add missing .previous statement to asm function [S390] increase default size of vmalloc area [S390] s390: disable change bit override [S390] fix io_return critical section cleanup [S390] sclp_async: potential buffer overflow [S390] arch/s390/kernel: Add missing unlock
Diffstat (limited to 'net/rose/rose_link.c')
0 files changed, 0 insertions, 0 deletions