Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:24:49 +0000 (14:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:24:49 +0000 (14:24 -0700)
commit303fd2c2ce5addef1aacac962a5b099cc0af71ea
treea20d906caec25a068742d6d9998baf79e5c72677
parent6b3a7c0f8a030561cb4eb5e905149938575e8085
parent9e5610a99535723e83b7ddd02f0fd3fe36c86649
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