Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git...

Pull blackfin updates from Steven Miao.

* tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
  Revert "blackfin: dma: current count mmr is read only"
  bf533: fix build error: add linux/gpio.h

diff --cc arch/blackfin/configs/BF526-EZBRD_defconfig
Simple merge

diff --cc arch/blackfin/configs/BF527-EZKIT-V2_defconfig
Simple merge

diff --cc arch/blackfin/configs/BF527-EZKIT_defconfig
Simple merge

diff --cc arch/blackfin/configs/BF548-EZKIT_defconfig
Simple merge