]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'iommu/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:58:26 +0000 (13:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 02:58:26 +0000 (13:58 +1100)
commit8dbcf5dfd27814c05e8d759fc6c5428e5e3c451c
treea414093cf5113420bdcf29c4c23afe789432242a
parent48a7291dc2a0a9f06fce7881dbbaea60cfd88c11
parentdd1a175695edf662615e422d1c85eae875a411b2
Merge remote-tracking branch 'iommu/next'

Conflicts:
drivers/gpu/drm/msm/Kconfig
drivers/gpu/drm/msm/Kconfig
drivers/iommu/intel_irq_remapping.c