summaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-01 21:37:01 (GMT)
committerOlof Johansson <olof@lixom.net>2012-10-01 21:37:01 (GMT)
commit7b27fa258c8f2670a8c09bbc6c4b2c874d155da2 (patch)
treeeee3e1cbe481ac38614ab621122626bf5248372e /virt
parenta8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 (diff)
parent6fd9b70e1b8f5d715728510b8f6e2566101143f1 (diff)
downloadlinux-7b27fa258c8f2670a8c09bbc6c4b2c874d155da2.tar.xz
Merge branch 'next/dt2' into HEAD
Conflicts: arch/arm/mach-exynos/clock-exynos5.c
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions