summaryrefslogtreecommitdiff
path: root/Documentation/hwmon/userspace-tools
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-04-04 00:18:36 +0400
committerLinus Walleij <linus.walleij@linaro.org>2013-04-04 00:18:36 +0400
commit6a7b3e970426f4bc2a8d52f81a4fda6595a9f052 (patch)
tree055765564c839e456fbe4c65c8cd2c4b00d731b7 /Documentation/hwmon/userspace-tools
parent661462f4c6d3c9ae0bac193c65936ebfac4c95b4 (diff)
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
downloadlinux-6a7b3e970426f4bc2a8d52f81a4fda6595a9f052.tar.xz
Merge tag 'v3.9-rc5' into devel
Linux 3.9-rc5 Conflicts: drivers/pinctrl/pinconf.c
Diffstat (limited to 'Documentation/hwmon/userspace-tools')
0 files changed, 0 insertions, 0 deletions