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
..
2011-09-21 13:39:59 -07:00
2005-10-18 08:26:15 -07:00
2011-03-11 14:25:50 +00:00
2008-06-06 11:29:10 -07:00
2011-10-29 21:20:22 +02:00
2007-07-17 10:23:04 -07:00
2006-06-25 10:01:20 -07:00
2012-03-23 16:58:38 -07:00
2006-06-25 10:01:20 -07:00
2007-05-10 18:24:13 +02:00
2011-03-31 11:26:23 -03:00
2012-03-23 16:58:38 -07:00
2012-05-07 16:51:19 -07:00
2012-03-28 15:58:21 -07:00
2012-01-31 23:19:47 +02:00
2011-12-08 19:52:43 -05:00