aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:31:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:31:56 -0800
commitd779188d2baf436e67fe8816fca2ef53d246900f (patch)
tree9bac75842a5611172860feec3c4019ff874a2b89 /init
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
parentMerge branch 'master' (diff)
downloadlinux-dev-d779188d2baf436e67fe8816fca2ef53d246900f.tar.xz
linux-dev-d779188d2baf436e67fe8816fca2ef53d246900f.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions