diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 23:14:35 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-07 23:14:35 +0100 |
commit | 1a14f30b36e5d20a2a1be24888c2158541d97bab (patch) | |
tree | 790531441ea86f7873d3d2874f33eeb5c1f2e938 /fs/ocfs2/namei.c | |
parent | 583bdc59820692eead7868e816d08bee4c55c1c6 (diff) | |
parent | cdc87c5a30f407ed1ce43d8a22261116873d5ef1 (diff) | |
download | blackbird-op-linux-1a14f30b36e5d20a2a1be24888c2158541d97bab.tar.gz blackbird-op-linux-1a14f30b36e5d20a2a1be24888c2158541d97bab.zip |
Merge branch 'acpi-general'
* acpi-general:
pnpacpi: fix incorrect TEST_ALPHA() test
ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
ACPI : do not use Lid and Sleep button for S5 wakeup
Diffstat (limited to 'fs/ocfs2/namei.c')
0 files changed, 0 insertions, 0 deletions