Merge branch 'hotfixes' into devel

	- 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/

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"

-----------

laptop_mode is a knob that controls "laptop mode". All the things that are

controlled by this knob are discussed in Documentation/laptop-mode.txt.

controlled by this knob are discussed in Documentation/laptops/laptop-mode.txt.

block_dump

----------

block_dump enables block I/O debugging when set to a nonzero value. More

information on block I/O debugging is in Documentation/laptop-mode.txt.

information on block I/O debugging is in Documentation/laptops/laptop-mode.txt.

swap_token_timeout

------------------

Keyboard notifier

One can use register_keyboard_notifier to get called back on keyboard

events (see kbd_keycode() function for details).  The passed structure is

keyboard_notifier_param:

- 'vc' always provide the VC for which the keyboard event applies;

- 'down' is 1 for a key press event, 0 for a key release;

- 'shift' is the current modifier state, mask bit indexes are KG_*;

- 'value' depends on the type of event.

- KBD_KEYCODE events are always sent before other events, value is the keycode.

- KBD_UNBOUND_KEYCODE events are sent if the keycode is not bound to a keysym.

  value is the keycode.

- KBD_UNICODE events are sent if the keycode -> keysym translation produced a

  unicode character. value is the unicode value.

- KBD_KEYSYM events are sent if the keycode -> keysym translation produced a

  non-unicode character. value is the keysym.

- KBD_POST_KEYSYM events are sent after the treatment of non-unicode keysyms.

  That permits one to inspect the resulting LEDs for instance.

For each kind of event but the last, the callback may return NOTIFY_STOP in

order to "eat" the event: the notify loop is stopped and the keyboard event is

dropped.

In a rough C snippet, we have:

kbd_keycode(keycode) {

	...

	params.value = keycode;

	if (notifier_call_chain(KBD_KEYCODE,&params) == NOTIFY_STOP)

	    || !bound) {

		notifier_call_chain(KBD_UNBOUND_KEYCODE,&params);

		return;

	}

	if (unicode) {

		param.value = unicode;

		if (notifier_call_chain(KBD_UNICODE,&params) == NOTIFY_STOP)

			return;

		emit unicode;

		return;

	}

	params.value = keysym;

	if (notifier_call_chain(KBD_KEYSYM,&params) == NOTIFY_STOP)

		return;

	apply keysym;

	notifier_call_chain(KBD_POST_KEYSYM,&params);

}

NOTE: This notifier is usually called from interrupt context.