diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 18:24:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 18:24:23 -0400 |
| commit | d77d9597ad8f2bd381a5168005a21e82df6f18eb (patch) | |
| tree | 43b4ceb5662b41ad340ae781f136afbeb30deeec /fs/lockd/svcproc.c | |
| parent | 0bba01695b74fdd2f9286243bb39f88544d81401 (diff) | |
| parent | b569ab3911aca64841bd819720d2b241aa09d713 (diff) | |
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 fails to load with newer Thinkpad X201s BIOS
acer-wmi: Fix capitalisation of GUID in module alias
sony-laptop: keyboard backlight fixes
sony-laptop: only show the handles sysfs file in debug mode
samsung-laptop: set backlight type
staging: samsung-laptop has moved to platform/x86
samsung-laptop: Samsung R410P backlight driver
samsung-laptop: add support for N230 model
platform-drivers: x86: pmic: Restore the dropped buslock/unlock
sony-laptop: fix early NULL pointer dereference
msi-laptop: fix config-dependent build error
eeepc-wmi: add keys found on EeePC 1215T
asus-wmi: swap input name and phys
asus-laptop: remove removed features from feature-removal-schedule.txt
Diffstat (limited to 'fs/lockd/svcproc.c')
0 files changed, 0 insertions, 0 deletions