Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000 (14:45 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 29 Jun 2012 12:45:58 +0000 (14:45 +0200)
commit59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266
treeb913718405d44a921905ac71044fbde410256865
parent57bdfdd80077addf518a9b90c4a66890efc4f70e
parent89abfab133ef1f5902abafb744df72793213ac19
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>
include/linux/mmzone.h
mm/vmscan.c