summaryrefslogtreecommitdiffstats
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:12:20 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-06-03 23:12:20 +0200
commitb04c58b1ed26317bfb4b33d3a2d16377fc6acd0f (patch)
tree8b6f65582a8fb3b70a07c16321969af1d06f7afc /security/apparmor/apparmorfs.c
parentMerge branch 'acpi-lpss' (diff)
parentACPI / scan: use platform bus type by default for _HID enumeration (diff)
downloadlinux-b04c58b1ed26317bfb4b33d3a2d16377fc6acd0f.tar.xz
linux-b04c58b1ed26317bfb4b33d3a2d16377fc6acd0f.zip
Merge branch 'acpi-enumeration'
* acpi-enumeration: ACPI / scan: use platform bus type by default for _HID enumeration ACPI / scan: always register ACPI LPSS scan handler ACPI / scan: always register memory hotplug scan handler ACPI / scan: always register container scan handler ACPI / scan: Change the meaning of missing .attach() in scan handlers ACPI / scan: introduce platform_id device PNP type flag ACPI / scan: drop unsupported serial IDs from PNP ACPI scan handler ID list ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule ACPI / PNP: use device ID list for PNPACPI device enumeration ACPI / scan: .match() callback for ACPI scan handlers
Diffstat (limited to 'security/apparmor/apparmorfs.c')
0 files changed, 0 insertions, 0 deletions