summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-04 01:50:19 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-04 01:50:19 +0200
commitd95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329 (patch)
tree7f3e1e4ec9070d6db9ab0f8fb0d9cb94afed4791 /kernel
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent/home/lenb/src/to-linus branch 'acpi-2.6.12' (diff)
downloadlinux-d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329.tar.xz
linux-d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions