Merge tag 'cris-for-linus-3.7' of git://jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 14:36:36 +0000 (07:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Oct 2012 14:36:36 +0000 (07:36 -0700)
commitb463036ad7c6e9a74275f4f901acb3dbb74ec1ad
treebfb3f6bb5c93f32728e5cfd052041f0619055f71
parenta06cb1ae3cb64367c0fdc313c43ebb0558e51827
parentd75d806cbbfb9c775e87779cd281c9c408c7aba3
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()
arch/cris/Kconfig
arch/cris/arch-v32/drivers/pci/bios.c