Alexander Graf bf550fc93d Merge remote-tracking branch 'origin/next' into kvm-ppc-next
Conflicts:
	mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
2013-08-29 00:41:59 +02:00
..
2013-04-23 16:05:05 +10:00
2013-04-23 16:05:05 +10:00
2012-03-28 18:30:02 +01:00
2012-03-28 18:30:02 +01:00
2013-07-01 17:57:25 +10:00
2013-07-01 11:10:33 +10:00
2013-07-01 17:57:25 +10:00
2013-04-26 16:08:17 +10:00
2011-11-28 21:13:18 +02:00
2013-07-01 17:57:25 +10:00
2011-03-31 11:26:23 -03:00
2013-05-14 16:00:17 +10:00
2013-05-14 16:00:17 +10:00
2013-05-14 16:00:17 +10:00
2011-03-31 11:26:23 -03:00
2013-07-01 17:57:25 +10:00
2013-04-18 13:03:53 +10:00
2010-07-19 10:56:54 +02:00
2011-03-31 11:26:23 -03:00
2012-03-28 18:30:02 +01:00
2013-07-01 17:57:25 +10:00