Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 13 Nov 2011 19:55:35 +0000 (20:55 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 13 Nov 2011 19:55:53 +0000 (20:55 +0100)
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.


Trivial merge