summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 15:02:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-16 15:02:20 -0700
commit8b97b21e0f4f59801d05a5c536417f04ecfb5603 (patch)
tree47c95c95a4f93a4596dc57204176ceb432234eba /init
parent99a15e21d96f6857dafab1e5167e5e8183215c9c (diff)
parent793925334f32e9026c22baee5c3c340f47d4ef7e (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd: proc: Fix Oops on stat of /proc/<zombie pid>/ns/net
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions