projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9a4f06 84a1caf)
Merge tag 'v3.5-rc7' into arm/tegra
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 17 Jul 2012 10:04:20 +0000 (12:04 +0200)
committerJoerg 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