Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas',... (76771c93) · Commits · github.com / kvm-riscv / linux

Commit 76771c93 authored Dec 02, 2014 by

Joerg Roedel

Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas',...

Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

Conflicts:
	drivers/iommu/arm-smmu.c

parents 99cb9aee 263bc3fd 11175886 e222d6a4 2d565a57 cc4f14aa 1c51099a 18f23409

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment