From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 13 Nov 2011 19:55:35 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.3-rc1~165^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2290c0d06d82faee87b1ab2d9d4f7bf81ef64379;p=pandora-kernel.git

Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
---

2290c0d06d82faee87b1ab2d9d4f7bf81ef64379
Reading git-diff-tree failed