| commit | 91e71c12c506e15028c252a5a097723f41c518dd | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 23 Sep 2010 20:30:13 +0000 (23 13:30 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 23 Sep 2010 20:30:13 +0000 (23 13:30 -0700) | ||
| tree | 161db8e1e6bf8d964c98769bddaa5166027ce698 | treesnapshot (tar.gz zip) |
| parent | ed3473b18f85b591c1e8afec831e9e06120142b7 | commitdiff |
| parent | fc6e756894b703952fd277a1f98a5d93e7ba847a | commitdiff |
Merge branch 'for_linus' of git://git./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
* '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