Skip to content
Commit 8ce44a21 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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
parents f9a4f063 84a1caf1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment