From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Sep 2013 21:55:16 +0000 (-0700)
Subject: Merge tag 'cris-for-3.12' of git://jni.nu/cris
X-Git-Tag: v3.12-rc1~65
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d7551eb1916832f2a5b27346edf24e7b2382f67;p=kernel%2Fkernel-generic.git

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

Pull CRIS updates from Jesper Nilsson:
 "Mostly cleanup and removal of unused configs"

* tag 'cris-for-3.12' of git://jni.nu/cris:
  CRIS: drop unused Kconfig symbols
  CRIS: Add kvm_para.h which includes generic file
  CRIS: remove unused current_regs
  CRIS: Remove last traces of legacy RTC drivers
  CRIS: remove "config OOM_REBOOT"
---

8d7551eb1916832f2a5b27346edf24e7b2382f67