summaryrefslogtreecommitdiffstats
path: root/net/ipv4/proc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-21 02:37:46 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-21 02:37:46 +0200
commit3a533374283aea50eab3976d8a6d30532175f009 (patch)
tree5944a2b40d8b40ec68818eb40235872c609ea741 /net/ipv4/proc.c
parentinitrd: Fix virtual/physical mix-up in overwrite test (diff)
parentMerge branch 'cris_debug_port_fix' into cris (diff)
downloadlinux-3a533374283aea50eab3976d8a6d30532175f009.tar.xz
linux-3a533374283aea50eab3976d8a6d30532175f009.zip
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: [CRISv10] Clean up compressed/misc.c [CRISv10] Correct whitespace damage. [CRIS] Correct definition of subdirs for install_headers. [CRIS] Correct image makefiles to allow using a separate OBJ-directory. [CRIS] Build fixes for compressed and rescue images for v10 and v32: It looks at least odd to apply spin_unlock to a mutex. cris: compile fixes for 2.6.26-rc5
Diffstat (limited to 'net/ipv4/proc.c')
0 files changed, 0 insertions, 0 deletions