summaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds2005-09-08 02:31:27 +0200
committerLinus Torvalds2005-09-08 02:31:27 +0200
commit0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch)
tree67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /init/Kconfig
parentMerge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airli... (diff)
parentMerge by hand (conflicts in sd.c) (diff)
downloadkernel-qcow2-linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.gz
kernel-qcow2-linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.xz
kernel-qcow2-linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions