From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 21:24:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier... 
X-Git-Tag: firefly_0821_release~9833^2~630
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=303fd2c2ce5addef1aacac962a5b099cc0af71ea;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: bf52x/bf54x boards: drop unused nand page size
  Blackfin: punt duplicate SPORT MMR defines
---

303fd2c2ce5addef1aacac962a5b099cc0af71ea