From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Apr 2015 22:48:55 +0000 (-0400)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: v4.1-rc1~110
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=45701e2636a02ab1c5305ead5236f05bda64c15f;p=karo-tx-linux.git

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull arch/c6x fixes from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback
  c6x: kernel: setup: Export symbol memory_end
  c6x: kernel: setup: Add screen_info global variable
  c6x: include: asm: Kbuild: Add generic serial.h
  c6x: include: asm: dma-mapping: Add dummy dma_sync_single_range_for_device
  c6x: include: asm: setup: Include "linux/types.h"
  c6x: asm: Add default flat.h according to xtensa architecture
  c6x: kernel: setup: Remove 'const' for local variables in machine_init
  c6x: Makefile: Add -D__linux__
  C6x: time: Ensure consistency in __init
  c6x: kernel: setup: Include "linux/console.h"
---

45701e2636a02ab1c5305ead5236f05bda64c15f