summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-12 11:40:15 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-12 11:40:15 -0700
commit192c028b6ac972df25fd624f94a94d038fbdb66c (patch)
tree4dd9d13ffd239e4d7c61401f892989742c671fa8 /drivers/w1
parentea1990c3796e7550e6f240983f2d1b8e5ecf3891 (diff)
parentfa389e220254c69ffae0d403eac4146171062d08 (diff)
downloadop-kernel-dev-192c028b6ac972df25fd624f94a94d038fbdb66c.zip
op-kernel-dev-192c028b6ac972df25fd624f94a94d038fbdb66c.tar.gz
Merge 3.14-rc6 into usb-next
We want the USB fixes in here as well.
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud