Jiri Kosina 59f91e5dd0 Merge branch 'master' into for-next
Conflicts:
	include/linux/mmzone.h

Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
2012-06-29 14:45:58 +02:00
..
2012-01-03 22:54:56 -05:00
2011-07-26 16:49:47 -07:00
2010-05-21 18:31:21 -04:00
2012-04-21 01:58:20 -04:00
2011-03-10 08:52:27 +01:00
2012-01-20 09:23:16 -08:00
2011-05-20 12:50:29 -07:00
2012-05-29 16:22:19 -07:00
2012-05-29 16:22:23 -07:00
2012-05-29 16:22:25 -07:00
2012-05-29 16:22:23 -07:00
2012-06-29 14:45:58 +02:00