summaryrefslogtreecommitdiffstats
path: root/drivers/pci/rom.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:43:42 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-01 16:43:42 -0800
commitb07e3c3a1db0ce399d2a1d04860e1b901927c05e (patch)
tree474c17e969b5462a3702f0021249e1d78522ac35 /drivers/pci/rom.c
parent5f56bbdf1e35d41b4b3d4c92bdb3e70c63877e4d (diff)
parentb94c7e677b9d28bd3f9ba4a70df6bfa7942867ca (diff)
Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: validate kernel object classes and permissions SELinux: ensure keys constant in hashtab_search SELinux: export object class and permission definitions SELinux: remove current object class and permission validation mechanism
Diffstat (limited to 'drivers/pci/rom.c')
0 files changed, 0 insertions, 0 deletions