summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 16:36:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-03 16:36:36 +0200
commitb463036ad7c6e9a74275f4f901acb3dbb74ec1ad (patch)
treebfb3f6bb5c93f32728e5cfd052041f0619055f71 /fs
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff)
parentCRIS: Remove VCS simulator specific code (diff)
downloadlinux-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