]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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()

1  2 
arch/cris/Kconfig
arch/cris/arch-v32/drivers/pci/bios.c

Simple merge
Simple merge