summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-11-17 16:26:13 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-17 16:26:13 -0800
commit1cef72646b78f106c0e37df69e88efc9aab01eba (patch)
tree13d9dfeb54d68315bdec6dfc0347bb9f6bd2da4c /kernel
parentfc983daf8fe2318d66f416931b0f6b1e469e78e6 (diff)
parent166148c45d14af02a50fcd1c3dc54bd3ccb0015f (diff)
Merge master.kernel.org:/home/acme/BK/includes-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions