From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 May 2013 14:21:16 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux
X-Git-Tag: v5.15~20118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5b8fcb48b9eb1a02f6a3a679da913f6c467527c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux

Pull blackfin updates from Steven Miao.

* tag 'for-linus' of git://github.com/realmz/blackfin-linux:
  bfin cache: dcplb map: add 16M dcplb map for BF60x
  blackfin: smp: fix smp build after drop asm/system.h
  blackfin: fix bootup core clock and system clock display
  Platform Nand: Set the GPIO for NAND read as input
  blackfin: rename vmImage to uImage after we move to buildroot
  blackfin: twi: Remove bogus #endif
  bf609: rsi: Add bf609 rsi MMR macro and board platform data.
  blackfin: dmc: Improve DDR2 write through in DMC effict controller.
---

f5b8fcb48b9eb1a02f6a3a679da913f6c467527c