Tejun Heo d4bbf7e775 Merge branch 'master' into x86/memblock
Conflicts & resolutions:

* arch/x86/xen/setup.c

	dc91c728fd "xen: allow extra memory to be in multiple regions"
	24aa07882b "memblock, x86: Replace memblock_x86_reserve/free..."

	conflicted on xen_add_extra_mem() updates.  The resolution is
	trivial as the latter just want to replace
	memblock_x86_reserve_range() with memblock_reserve().

* drivers/pci/intel-iommu.c

	166e9278a3f "x86/ia64: intel-iommu: move to drivers/iommu/"
	5dfe8660a3d "bootmem: Replace work_with_active_regions() with..."

	conflicted as the former moved the file under drivers/iommu/.
	Resolved by applying the chnages from the latter on the moved
	file.

* mm/Kconfig

	6661672053a "memblock: add NO_BOOTMEM config symbol"
	c378ddd53f9 "memblock, x86: Make ARCH_DISCARD_MEMBLOCK a config option"

	conflicted trivially.  Both added config options.  Just
	letting both add their own options resolves the conflict.

* mm/memblock.c

	d1f0ece6cdc "mm/memblock.c: small function definition fixes"
	ed7b56a799c "memblock: Remove memblock_memory_can_coalesce()"

	confliected.  The former updates function removed by the
	latter.  Resolution is trivial.

Signed-off-by: Tejun Heo <tj@kernel.org>
2011-11-28 09:46:22 -08:00
..
2008-10-22 22:55:23 -07:00
2011-09-25 19:53:00 +03:00
2009-01-29 14:16:51 +01:00
2011-08-29 13:44:12 -07:00
2011-08-29 13:44:12 -07:00
2008-10-22 22:55:23 -07:00
2011-01-13 08:03:25 -08:00
2011-02-23 22:27:52 +01:00
2009-12-05 09:10:12 -08:00
2008-10-22 22:55:23 -07:00
2011-03-18 10:39:30 +01:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2011-02-14 12:08:28 +01:00
2008-10-22 22:55:20 -07:00
2011-08-04 16:13:49 -07:00
2008-10-22 22:55:23 -07:00
2011-09-27 18:08:04 +02:00
2011-05-02 17:24:48 +02:00
2008-10-22 22:55:23 -07:00
2011-05-09 12:14:29 -07:00
2008-10-22 22:55:20 -07:00
2010-02-16 21:22:26 -08:00
2008-10-22 22:55:20 -07:00
2011-06-05 21:30:32 +02:00
2008-10-22 22:55:23 -07:00
2011-05-16 14:55:57 -04:00
2011-04-18 09:26:48 -07:00
2010-10-26 16:52:08 -07:00
2008-10-22 22:55:23 -07:00
2011-01-07 10:03:50 -05:00
2008-10-22 22:55:23 -07:00
2009-03-27 14:43:57 -04:00
2009-08-27 00:35:56 +02:00
2011-02-24 14:52:18 +01:00
2010-03-10 13:23:34 +01:00
2008-10-22 22:55:20 -07:00
2010-10-26 16:52:08 -07:00
2009-01-21 17:26:06 +09:00
2011-02-23 22:27:52 +01:00
2008-10-22 22:55:23 -07:00
2010-08-14 22:26:51 +02:00
2011-07-26 16:49:43 -07:00
2009-06-13 15:37:30 +02:00
2008-10-22 22:55:23 -07:00
2011-07-22 14:39:50 +09:30
2011-05-24 14:33:35 +02:00
2010-06-09 11:12:36 +02:00
2011-07-26 16:49:47 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2011-07-26 16:49:47 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2010-05-07 17:13:04 -07:00
2011-09-25 19:53:00 +03:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2010-06-29 12:12:59 +02:00
2008-10-22 22:55:23 -07:00
2011-10-14 09:05:28 -07:00
2008-10-22 22:55:23 -07:00
2011-05-10 15:43:32 -07:00
2010-11-01 15:38:34 -04:00
2010-10-26 16:52:08 -07:00
2011-01-13 17:32:44 -08:00
2011-06-05 21:30:33 +02:00
2011-01-13 17:32:44 -08:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:20 -07:00
2009-02-02 23:27:09 +05:30
2011-03-15 15:34:15 -07:00
2011-07-26 16:49:47 -07:00
2010-02-12 09:42:39 -08:00
2011-03-18 10:39:30 +01:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:20 -07:00
2011-08-29 13:44:12 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2009-06-15 12:40:02 +02:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:20 -07:00
2009-01-31 00:19:32 +05:30
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2011-07-26 16:49:47 -07:00
2008-10-22 22:55:23 -07:00
2011-03-23 19:47:18 -07:00
2011-05-20 12:50:29 -07:00
2011-05-20 12:50:29 -07:00
2008-10-22 22:55:23 -07:00
2011-10-31 17:30:44 -07:00
2011-10-31 17:30:44 -07:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2011-06-05 21:30:32 +02:00
2008-10-22 22:55:20 -07:00
2008-10-22 22:55:23 -07:00
2008-10-22 22:55:23 -07:00
2009-06-15 12:40:02 +02:00