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-04-21 23:48:58 -07:00
2012-06-27 17:35:55 +02:00
2012-06-29 14:45:58 +02:00
2012-05-29 11:53:11 -07:00
2010-11-30 23:10:26 -08:00
2010-11-30 23:10:26 -08:00
2012-02-02 14:42:20 +01:00