Merge tag 'cris-for-3.12' of git://jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Sep 2013 21:55:16 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Sep 2013 21:55:16 +0000 (14:55 -0700)
commit8d7551eb1916832f2a5b27346edf24e7b2382f67
treea9151f92b1586e024a839e71aa2c58d7f44cee41
parent3da06ed7366f6749ac333d1c051131c1a550755f
parentbe8cb7f42ab9a8723082daa83ac28a11d4dde942
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"