summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-02 23:55:27 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-02 23:55:27 -0800
commitfb53fde9762432d091dac209bdf4f3f850117c55 (patch)
tree607b09022b206a539cb4a924e4ef476443798252 /kernel/nsproxy.c
parenteb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff)
parentb1792e367053968f2ddb48bc911d314143ce6242 (diff)
downloadlinux-fb53fde9762432d091dac209bdf4f3f850117c55.tar.gz
linux-fb53fde9762432d091dac209bdf4f3f850117c55.tar.bz2
linux-fb53fde9762432d091dac209bdf4f3f850117c55.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions