summaryrefslogtreecommitdiffstats
path: root/Documentation/rpmsg.txt
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-30 00:24:40 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-30 00:24:40 +0200
commitfeb41bb1ca6b969985cd5e486a3f2deac9f089fa (patch)
treeaeb6c21669858b06c1086cb3fe4d5d8124329835 /Documentation/rpmsg.txt
parentb6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff)
parente70dba6020eaaceb1d3619dfb535c719900c7091 (diff)
downloadop-kernel-dev-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.zip
op-kernel-dev-feb41bb1ca6b969985cd5e486a3f2deac9f089fa.tar.gz
Merge back earlier acpi-pnp material.
Conflicts: drivers/pnp/pnpacpi/core.c
Diffstat (limited to 'Documentation/rpmsg.txt')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud