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-05-11 17:03:12 -07:00
2012-06-29 14:45:58 +02:00
2012-05-20 20:25:59 +03:00
2012-05-21 12:17:30 +01:00
2012-05-22 02:58:55 +02:00
2012-05-29 16:22:19 -07:00
2012-05-22 09:23:24 -07:00