summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 16:58:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-27 16:58:20 -0700
commitcdada08eb26e7cc57bb423e51e6e70fd5450a0b5 (patch)
tree3235890f93df8ac3922d50fd767d305ea85761b2 /init
parent927321440976d0781a252eefe686ae6b0f236ae2 (diff)
parent2ad41065d9fe518759b695fc2640cf9c07261dd2 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions