From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Oct 2012 14:36:36 +0000 (-0700)
Subject: Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris
X-Git-Tag: v3.7-rc1~126
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b463036ad7c6e9a74275f4f901acb3dbb74ec1ad;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Pull CRIS changes from Jesper Nilsson:
 "Removal of some unused code from the CRIS port"

* tag 'cris-for-linus-3.7' of git://jni.nu/cris:
  CRIS: Remove VCS simulator specific code
  cris/PCI: remove pcibios_assign_resources()
---

b463036ad7c6e9a74275f4f901acb3dbb74ec1ad