diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-02-04 18:53:44 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-02-04 18:53:44 +0300 |
| commit | a20cc76b9efae10c20123049df361adcd7f0e0b3 (patch) | |
| tree | 195502a0d3dfa60ccf0704070e13440be837c068 /net | |
| parent | bb590c9011a7c4e195af486438ead666023f96bd (diff) | |
| parent | a4188beee59763b3507939968677776561adbba5 (diff) | |
| parent | 1d7f449c898b4180b9db79007f23f599b5bb879e (diff) | |
| parent | cd70d4659ff3ab7e25b29a6f70be5bcfd078db1f (diff) | |
| parent | ae0cbbb1cde1f1bc2454a138a5cab1887d0e103c (diff) | |
| parent | 63ce3ae889db917cff0cf0c65c837ca7160c8a83 (diff) | |
| download | linux-a20cc76b9efae10c20123049df361adcd7f0e0b3.tar.xz | |
Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next
Conflicts:
drivers/iommu/Kconfig
drivers/iommu/Makefile