aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 09:01:32 -0800
commit5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch)
tree8290f03bcd6af331d7a401282028acfeea37d1de /kernel
parentMerge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block (diff)
parentMerge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
downloadlinux-dev-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.tar.xz
linux-dev-5b2f7ffcb734d3046144dfbd5ac6d76254a9e522.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions