From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2014 03:08:47 +0000 (-0700)
Subject: Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.16-rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/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
---

88bbfb4a6267ff90a466ade9762d9a8fff2bb1bb