summaryrefslogtreecommitdiff
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-03 16:28:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-03 16:28:57 -0700
commite315c121a858499d84dc88c499046b9f10bb61ec (patch)
tree3f5aba40b97a6e51f2aec5cc6a44dbe7310f3f2d /drivers/parport
parent4ba51fd75cc3789be83f0d6f878dabbb0cb19bca (diff)
parenta02fe13297af26c13d004b1d44f391c077094ea0 (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: prevent rentry into the FS
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions