tree 4bf04cdeed59775462d5326d3bcb00c7343b6163
parent f9a4f063a88297e361fd6676986cf3e39b22de72
parent 84a1caf1453c3d44050bd22db958af4a7f99315c
author Joerg Roedel <joerg.roedel@amd.com> 1342519460 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1342519460 +0200
mergetag object 84a1caf1453c3d44050bd22db958af4a7f99315c
 type commit
 tag v3.5-rc7
 tagger Linus Torvalds <torvalds@linux-foundation.org> 1342305674 -0700
 
 Linux 3.5-rc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQAfWKAAoJEHm+PkMAQRiG/DwIAIullMhkDhD/GJcn24ZbUJoa
 v6zRPK2hIavuKH/6bUoUiXT346PUYgVnRMhetuYKJFURz6KX/nmlxve/iXNn/WP1
 9hnxhE+zcnp2qKI83c3Yok09eed1KnGY5hWQkqXM2gzji/OU0pCKchOcL01l//uz
 iiWpNAXEVUnT92CafnHlZ55f/MWVqRFmDKi3Ty1YKSskhojQ6NOPsWCxrTxKVbim
 2YPXc3D+xLHzF12ufVgla20AF4KnK8m+tFugniRAqArIagpzBUP1x1wk0RN5PyBD
 FTP8lv7bSfBusp41/mPDB66WAe9EfQBoWQY6jloJjp0i8xnMyH5V05pImBV5NwU=
 =O+gl
 -----END PGP SIGNATURE-----

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