tree e075e4d5534193f28e6059904f61e5ca03958d3c
parent 4da669a2e3e5bc70b30a0465f3641528681b5f77
parent 52e4c2a05256cb83cda12f3c2137ab1533344edb
author Jiri Kosina <jkosina@suse.cz> 1321214135 +0100
committer Jiri Kosina <jkosina@suse.cz> 1321214153 +0100

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.