diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
| commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
| tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /drivers/net/Kconfig | |
| parent | iommu/tegra: Don't call alloc_pdir with as->lock (diff) | |
| parent | Linux 3.5-rc7 (diff) | |
| download | linux-8ce44a2174c3b07950d7a8d44774e23e60518205.tar.xz linux-8ce44a2174c3b07950d7a8d44774e23e60518205.zip | |
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
Diffstat (limited to 'drivers/net/Kconfig')
0 files changed, 0 insertions, 0 deletions