From: Linus Torvalds Date: Thu, 16 Jun 2011 22:02:20 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd X-Git-Tag: firefly_0821_release~3680^2~5233 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b97b21e0f4f59801d05a5c536417f04ecfb5603;p=firefly-linux-kernel-4.4.55.git Merge git://git./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//ns/net --- 8b97b21e0f4f59801d05a5c536417f04ecfb5603