| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 | [log] [tgz] |
|---|---|---|
| author | Joerg Roedel <joerg.roedel@amd.com> | Tue Jul 17 12:04:20 2012 +0200 |
| committer | Joerg Roedel <joerg.roedel@amd.com> | Tue Jul 17 12:04:20 2012 +0200 |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 | |
| parent | f9a4f063a88297e361fd6676986cf3e39b22de72 [diff] | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c [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