summaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_cipso_v4.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 01:28:38 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 01:28:38 +0200
commit4b319f290d3b9c756228a66f72095d0039ec1b50 (patch)
tree2cda8d4ac3d1f2d9732a2b16feb15b14f91c83f7 /net/netlabel/netlabel_cipso_v4.c
parent0ad4c9a9848fdd46dc422160efd947489a98bbc1 (diff)
parent01c6a6afd50f07dfd66b2891fd194c4b789fca48 (diff)
Merge branch 'acpi-sleep'
* acpi-sleep: x86 / tboot / ACPI: Fail extended mode reduced hardware sleep xen / ACPI: notify xen when reduced hardware sleep is available ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path
Diffstat (limited to 'net/netlabel/netlabel_cipso_v4.c')
0 files changed, 0 insertions, 0 deletions