summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 13:30:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-23 13:30:13 -0700
commit91e71c12c506e15028c252a5a097723f41c518dd (patch)
tree161db8e1e6bf8d964c98769bddaa5166027ce698 /security
parented3473b18f85b591c1e8afec831e9e06120142b7 (diff)
parentfc6e756894b703952fd277a1f98a5d93e7ba847a (diff)
downloadlinux-3.10-91e71c12c506e15028c252a5a097723f41c518dd.tar.gz
linux-3.10-91e71c12c506e15028c252a5a097723f41c518dd.tar.bz2
linux-3.10-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 'security')
0 files changed, 0 insertions, 0 deletions