summaryrefslogtreecommitdiffstats
path: root/security/tomoyo
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 22:30:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 22:30:13 +0200
commit91e71c12c506e15028c252a5a097723f41c518dd (patch)
tree161db8e1e6bf8d964c98769bddaa5166027ce698 /security/tomoyo
parentMN10300: Arch doesn't support HAVE_ARCH_TRACEHOOK (diff)
parentthinkpad-acpi: avoid keymap pitfall (diff)
downloadlinux-91e71c12c506e15028c252a5a097723f41c518dd.tar.xz
linux-91e71c12c506e15028c252a5a097723f41c518dd.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: thinkpad-acpi: avoid keymap pitfall Change MSI LAPTOP driver maintainer to Lee, Chun-Yi
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions