diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:36:36 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 16:36:36 +0200 |
commit | b463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch) | |
tree | bfb3f6bb5c93f32728e5cfd052041f0619055f71 /fs | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
parent | CRIS: Remove VCS simulator specific code (diff) | |
download | linux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.tar.xz linux-b463036ad7c6e9a74275f4f901acb3dbb74ec1ad.zip |
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()
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions