summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/attach.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-29 21:24:00 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-29 21:24:00 +0100
commit4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60 (patch)
tree601f8f765d4bfc78f2c1f16bd8e140f50c618e3e /drivers/mtd/ubi/attach.c
parentMerge branches 'pm-cpufreq' and 'pm-cpuidle' (diff)
parentPM / Domains: Export of_genpd_get_from_provider function (diff)
parentpowercap / RAPL: add IDs for future Xeon CPUs (diff)
parenttools / cpupower: Fix no idle state information return value (diff)
downloadlinux-4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60.tar.xz
linux-4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60.zip
Merge branches 'pm-domains', 'powercap' and 'pm-tools'
* pm-domains: PM / Domains: Export of_genpd_get_from_provider function * powercap: powercap / RAPL: add IDs for future Xeon CPUs * pm-tools: tools / cpupower: Fix no idle state information return value tools / cpupower: Correctly detect if running as root