projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f9a4f06
84a1caf
)
Merge tag 'v3.5-rc7' into arm/tegra
author
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 17 Jul 2012 10:04:20 +0000
(12:04 +0200)
committer
Joerg Roedel
<joerg.roedel@amd.com>
Tue, 17 Jul 2012 10:04:20 +0000
(12:04 +0200)
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Trivial merge