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

*.orig

*.rej

*~

\#*#

	- directory with info about Linux on Intel 32 bit architecture.

ia64/

	- directory with info about Linux on Intel 64 bit architecture.

ide.txt

	- important info for users of ATA devices (IDE/EIDE disks and CD-ROMS).

infiniband/

	- directory with documents concerning Linux InfiniBand support.

initrd.txt

	- documents the kernel probes debugging feature.

kref.txt

	- docs on adding reference counters (krefs) to kernel objects.

laptop-mode.txt

	- how to conserve battery power using laptop-mode.

laptops/

	- directory with laptop related info and laptop driver documentation.

ldm.txt

	- info on the Linux PCMCIA driver.

pi-futex.txt

	- documentation on lightweight PI-futexes.

pm.txt

	- info on Linux power management support.

pnp.txt

	- Linux Plug and Play documentation.

power_supply_class.txt

	- Tells userspace about battery, UPS, AC or DC power supply properties

power/

	- directory with info on Linux PCI power management.

powerpc/

  <chapter id="blkdev">

     <title>Block Devices</title>

!Eblock/blk-core.c

!Iblock/blk-core.c

!Eblock/blk-map.c

!Iblock/blk-sysfs.c

!Eblock/blk-settings.c

!Eblock/blk-exec.c

!Eblock/blk-barrier.c

!Eblock/blk-tag.c

!Iblock/blk-tag.c

  </chapter>

  <chapter id="chrdev">

Linux supports two methods of overriding the BIOS DSDT:

Linux supports a method of overriding the BIOS DSDT:

CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.

CONFIG_ACPI_CUSTOM_DSDT_INITRD adds the image to the initrd.

When to use these methods is described in detail on the

When to use this method is described in detail on the

Linux/ACPI home page:

http://www.lesswatts.org/projects/acpi/overridingDSDT.php

Note that if both options are used, the DSDT supplied

by the INITRD method takes precedence.

Documentation/initramfs-add-dsdt.sh is provided for convenience

for use with the CONFIG_ACPI_CUSTOM_DSDT_INITRD method.

#!/bin/bash

# Adds a DSDT file to the initrd (if it's an initramfs)

# first argument is the name of archive

# second argument is the name of the file to add

# The file will be copied as /DSDT.aml

# 20060126: fix "Premature end of file" with some old cpio (Roland Robic)

# 20060205: this time it should really work

# check the arguments

if [ $# -ne 2 ]; then

	program_name=$(basename $0)

	echo "\

$program_name: too few arguments

Usage: $program_name initrd-name.img DSDT-to-add.aml

Adds a DSDT file to an initrd (in initramfs format)

  initrd-name.img: filename of the initrd in initramfs format

  DSDT-to-add.aml: filename of the DSDT file to add

  " 1>&2

    exit 1

fi

# we should check it's an initramfs

tempcpio=$(mktemp -d)

# cleanup on exit, hangup, interrupt, quit, termination

trap 'rm -rf $tempcpio' 0 1 2 3 15

# extract the archive

gunzip -c "$1" > "$tempcpio"/initramfs.cpio || exit 1

# copy the DSDT file at the root of the directory so that we can call it "/DSDT.aml"

cp -f "$2" "$tempcpio"/DSDT.aml

# add the file

cd "$tempcpio"

(echo DSDT.aml | cpio --quiet -H newc -o -A -O "$tempcpio"/initramfs.cpio) || exit 1

cd "$OLDPWD"

# re-compress the archive

gzip -c "$tempcpio"/initramfs.cpio > "$1"