aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-05-30 12:41:29 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2012-05-30 12:41:29 +0200
commit28f8571e1e84782244cc7bf1b129baf6cdc0832e (patch)
tree31838b4724f687e23d439c5b1854eb4ce9598288 /drivers
parent3d06fca8d2aa3543030e40b95f1d62f9f5a03540 (diff)
parent29cdd4e4ec91aae239192bb122d377d15a9d75e3 (diff)
parent803b5277215c75a5cc3b3eb5d19015c7290601a5 (diff)
parent774dfc9bb7f2ab1950a790a8f13eca3d5c580033 (diff)
parent77ca23323594589ac8cba1c8d59bfe7e85d3cb8b (diff)
parentc099cf1731f5929af18928a50c8c814b44b30f98 (diff)
downloadlinux-28f8571e1e84782244cc7bf1b129baf6cdc0832e.tar.gz
Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap', 'arm/tegra', 'core' and 'x86/amd' into next