From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 29 Jun 2012 12:45:58 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.6-rc1~118^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266;p=pandora-kernel.git

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>
---

59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266
Reading git-diff-tree failed