summaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 01:05:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-12-07 01:05:17 +0100
commit9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch)
tree78c1be21493ef183de9444cf0d2bfb1e729b0698 /fs/ubifs
parentMerge branch 'acpi-pci-hotplug' into acpi-hotplug (diff)
parentACPI: Clean up inclusions of ACPI header files (diff)
downloadlinux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.tar.xz
linux-9ccad66f0171578445175ecd3bf66b35a96aaf6e.zip
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts: drivers/acpi/scan.c
Diffstat (limited to 'fs/ubifs')
0 files changed, 0 insertions, 0 deletions