summaryrefslogtreecommitdiffstats
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 18:09:48 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 18:09:48 +0200
commitb73b636e8987f8728c6c700377615757691b9a55 (patch)
tree554a4c799888e8934d2bf222bd0fcae2a9146bb4 /block/blk-core.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
parentCRIS: proper defconfig setup (diff)
downloadlinux-b73b636e8987f8728c6c700377615757691b9a55.tar.xz
linux-b73b636e8987f8728c6c700377615757691b9a55.zip
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: CRIS: proper defconfig setup [CRIS] Rename boot-linkscripts and fix the path to them.
Diffstat (limited to 'block/blk-core.c')
0 files changed, 0 insertions, 0 deletions