projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8ce44a2174c3b07950d7a8d44774e23e60518205
tree4bf04cdeed59775462d5326d3bcb00c7343b6163tree | snapshot (tar.gz zip)
parentf9a4f063a88297e361fd6676986cf3e39b22de72commit | diff
parent84a1caf1453c3d44050bd22db958af4a7f99315ccommit | diff
Merge tag 'v3.5-rc7' into arm/tegra

This solves the merge conflicts while creating the next
branch.

Linux 3.5-rc7

Conflicts:
drivers/iommu/tegra-smmu.c
kernel source for telekom puls (alcatel/mediatek)