summaryrefslogtreecommitdiff
path: root/drivers/w1
diff options
context:
space:
mode:
authorAnton Vorontsov <anton@enomsg.org>2013-03-31 02:47:40 +0400
committerAnton Vorontsov <anton@enomsg.org>2013-03-31 02:47:40 +0400
commit18bc4e79fdff1baa82d57ef364590fcdcc0a2612 (patch)
tree6d1a086f78d4c39fbb74057b2fd13890d1a8f900 /drivers/w1
parent6e997bb894beef128fcfe1679e0830f97dee6dc2 (diff)
parent65deb782858128cde598ac4a9150ab7cdd29dafa (diff)
downloadlinux-18bc4e79fdff1baa82d57ef364590fcdcc0a2612.tar.xz
Merge branch 'vexpress' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
From Catalin Marinas <catalin.marinas@arm.com>: "... move the vexpress poweroff/restart code from arch/arm to driver/power/reset so that the code can be reused in arm64."
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions