Konrad Rzeszutek Wilk a5f9515570 Merge branch 'stable/late-swiotlb.v3.3' into stable/for-linus-3.7 ... * stable/late-swiotlb.v3.3: xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer. xen/swiotlb: Remove functions not needed anymore. xen/pcifront: Use Xen-SWIOTLB when initting if required. xen/swiotlb: For early initialization, return zero on success. xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used. xen/swiotlb: Move the error strings to its own function. xen/swiotlb: Move the nr_tbl determination in its own function. swiotlb: add the late swiotlb initialization function with iotlb memory xen/swiotlb: With more than 4GB on 64-bit, disable the native SWIOTLB. xen/swiotlb: Simplify the logic. Conflicts: arch/x86/xen/pci-swiotlb-xen.c Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>		2012-09-22 20:01:24 -04:00
..
acpi	Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base	2012-08-03 00:31:23 -04:00
asm-generic	mutex: Place lock in contended state after fastpath_lock failure	2012-08-13 18:46:54 +02:00
crypto
drm	drm: Check for invalid cursor flags	2012-08-24 09:38:40 +10:00
keys
linux	Merge branch 'stable/late-swiotlb.v3.3' into stable/for-linus-3.7	2012-09-22 20:01:24 -04:00
math-emu
media	[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl	2012-07-30 20:23:05 -03:00
memory
misc
mtd
net	Merge branch 'master' of git://1984.lsi.us.es/nf	2012-08-31 13:06:37 -04:00
pcmcia
ras
rdma	Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus	2012-07-22 23:26:17 -07:00
rxrpc
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sound	ASoC: Additional updates for 3.6	2012-08-20 21:26:04 +02:00
target	target: Remove unused se_cmd.cmd_spdtl	2012-08-21 14:27:35 -07:00
trace	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-08-03 10:57:20 -07:00
video	video: da8xx-fb: configure FIFO threshold to reduce underflow errors	2012-07-29 01:11:09 +00:00
xen	Merge branch 'stable/late-swiotlb.v3.3' into stable/for-linus-3.7	2012-09-22 20:01:24 -04:00
Kbuild