summaryrefslogtreecommitdiffstats
path: root/drivers/powercap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-24 22:34:54 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-24 22:34:54 +0100
commit58e868be77bda526cc8d4264488ed393bc607720 (patch)
treef95692355ca78239815c1df58fe2fee7dc79d80d /drivers/powercap
parentMerge tag 'iio-fixes-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentLinux 3.14-rc4 (diff)
downloadlinux-58e868be77bda526cc8d4264488ed393bc607720.tar.xz
linux-58e868be77bda526cc8d4264488ed393bc607720.zip
Merge 3.14-rc4 into char-misc-linus
Merge this to catch up with the other patches sent upstream. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/powercap')
0 files changed, 0 insertions, 0 deletions