git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 30 Sep 2011 14:47:19 +0000 (16:47 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 30 Sep 2011 14:47:19 +0000 (16:47 +0200)
commit	1a9ca7b0591d4806014bdf24fd8c12ea494f6673
tree	1435f215367e55d79274a95697718d21c577fa66	tree \| snapshot
parent	7b6d45f139262aa7b1b604a67963e5c8c01304d3	commit \| diff
parent	0ed6d2d27bcc2ace454a8c55446e1bc3efd2d529	commit \| diff
parent	d8011fc9d6d0c9279e712c346432f2bec7aabca7	commit \| diff

Merge branches 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next

Conflicts:
drivers/iommu/iommu.c

drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	blob \| history