projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06cb1a d75d806)
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 patch | diff1 | diff2 | blob | history
arch/cris/arch-v32/drivers/pci/bios.c patch | diff1 | diff2 | blob | history

diff --cc arch/cris/Kconfig
Simple merge
diff --cc arch/cris/arch-v32/drivers/pci/bios.c
Simple merge
kernel source for telekom puls (alcatel/mediatek)