Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2010-09-23 13:30:13 -07:00

parent ed3473b18f fc6e756894

commit 91e71c12c5

2 changed files with 4 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

MAINTAINERS

View file

5

drivers/platform/x86/thinkpad_acpi.c

View file