Joerg Roedel 09b5269a1b Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next ... Conflicts: drivers/iommu/arm-smmu.c		2014-10-02 12:24:45 +02:00
..
core	Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	2014-09-22 10:05:40 -07:00
hw	Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next	2014-10-02 12:24:45 +02:00
ulp	Last late set of InfiniBand/RDMA fixes for 3.17:	2014-09-23 16:47:34 -07:00
Kconfig	Merge branch 'ip-roce' into for-next	2014-01-22 23:24:21 -08:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00