summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-19 15:48:53 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-19 15:48:53 -0800
commit9472e348190603fffed9a32e19c54a5cf17e4bcc (patch)
treecab35f9e8f975dc7b2a0654035f45012b4fa1227 /kernel
parent90fcd610926a7d54d8d488faaa313109bb82f88a (diff)
parent4debb9ea116cb46ea91819d0886915f59df58544 (diff)
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions