aboutsummaryrefslogtreecommitdiff
path: root/net/8021q/vlan.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 07:45:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 07:45:49 -0700
commitd40c2f29f3b0f5937bace575722598dac474c478 (patch)
treea757da81f2a5e8a145ccfbecbf624bf673f41f03 /net/8021q/vlan.c
parent6be9f7b2835fa442f6b892f174dabc4023c0af2e (diff)
parent0794c66d49885a2f615618ce4940434b5b067d84 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: selinux: handle files opened with flags 3 by checking ioctl permission
Diffstat (limited to 'net/8021q/vlan.c')
0 files changed, 0 insertions, 0 deletions