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-06-29 14:45:58 +02:00
2012-05-29 16:22:18 -07:00
2012-05-28 09:54:45 -07:00
2012-05-28 09:54:45 -07:00