From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Dec 2012 15:24:17 +0000 (-0800)
Subject: Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c5445015c8e37d4f79c16fa51be398c4cb0e46c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris

Pull CRIS changes from Jesper Nilsson.

... mainly the UAPI disintegration.

* tag 'cris-for-linus-3.8' of git://jni.nu/cris:
  UAPI: Fix up empty files in arch/cris/
  CRIS: locking: fix the return value of arch_read_trylock()
  CRIS: use kbuild.h instead of defining macros in asm-offset.c
  UAPI: (Scripted) Disintegrate arch/cris/include/asm
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
---

0c5445015c8e37d4f79c16fa51be398c4cb0e46c