Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 03:08:47 +0000 (20:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 03:08:47 +0000 (20:08 -0700)
commit88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb
tree5d7693dd6e3fe81bb72ec3d83e9f9a8bb9aac649
parent71998d1be4ae70e7d320cdd21595c1a02a29c61e
parent51fdc6bf98802eb7019ec94dfd82f0e6cd1c82a8
Merge tag 'blackfin-for-linus' of git./linux/kernel/git/realmz6/blackfin-linux

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
arch/blackfin/configs/BF526-EZBRD_defconfig
arch/blackfin/configs/BF527-EZKIT-V2_defconfig
arch/blackfin/configs/BF527-EZKIT_defconfig
arch/blackfin/configs/BF548-EZKIT_defconfig