Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

.gitignore

Documentation/00-INDEX

Documentation/DocBook/kernel-api.tmpl

Documentation/acpi/dsdt-override.txt

Documentation/acpi/initramfs-add-dsdt.sh

Documentation/cdrom/ide-cd

Documentation/controllers/memory.txt

Documentation/debugging-via-ohci1394.txt

Documentation/feature-removal-schedule.txt

Documentation/filesystems/proc.txt

Documentation/gpio.txt

Documentation/ide/00-INDEX

Documentation/ide/ide.txt

Documentation/kernel-parameters.txt

Documentation/kprobes.txt

Documentation/laptops/00-INDEX

Documentation/laptops/acer-wmi.txt

Documentation/laptops/laptop-mode.txt

Documentation/lguest/lguest.c

Documentation/pci.txt