git.stricted.de - GitHub/mt8127/android_kernel_alcatel_ttab.git/commit

projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 805a6af 1a36ea8 1456e9d)

author	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 9 Jan 2012 12:04:05 +0000 (13:04 +0100)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 9 Jan 2012 12:04:05 +0000 (13:04 +0100)
commit	00fb5430f547e411ab03385cfa548776aaac1c92
tree	f2c543e9c9ce4b1400081de08bcaf6fd55b72972	tree \| snapshot (tar.gz zip)
parent	805a6af8dba5dfdd35ec35dc52ec0122400b2610	commit \| diff
parent	1a36ea815a3557c03819ec7c90a6b2fb128385ca	commit \| diff
parent	1456e9d2c4667a6e9221eda27b9648fb3bcc1e8e	commit \| diff

Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

Conflicts:
drivers/pci/hotplug/acpiphp_glue.c

drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/iommu/omap-iovmm.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/media/video/omap3isp/ispccdc.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/media/video/omap3isp/ispstat.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/media/video/omap3isp/ispvideo.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/pci/ats.c	diff1 \|	diff2 \|	diff3 \|	blob \| history

kernel source for telekom puls (alcatel/mediatek)