summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2015-08-23 18:54:39 +0530
committerVinod Koul <vinod.koul@intel.com>2015-08-23 18:54:39 +0530
commitb2b48ac4c584ae31eb23ad1f86964cc6e52eaa54 (patch)
tree9e973522bc1f407be44afdee3743b227c945007d /drivers/w1
parent76891cc8c4930e21b9bce226524f1b57756bc25e (diff)
parented9c87b33147e5b007e66a282b9c8c307fbf8bf9 (diff)
downloadlinux-b2b48ac4c584ae31eb23ad1f86964cc6e52eaa54.tar.bz2
Merge branch 'topic/zxdma' into for-linus
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions