Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

What:		A notification mechanism for thermal related events

Description:

	This interface enables notification for thermal related events.

	The notification is in the form of a netlink event.

Other Pieces

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

Get the detailed info related with the IPMI device

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

Some users need more detailed information about a device, like where

the address came from or the raw base device for the IPMI interface.

You can use the IPMI smi_watcher to catch the IPMI interfaces as they

come or go, and to grab the information, you can use the function

ipmi_get_smi_info(), which returns the following structure:

struct ipmi_smi_info {

	enum ipmi_addr_src addr_src;

	struct device *dev;

	union {

		struct {

			void *acpi_handle;

		} acpi_info;

	} addr_info;

};

Currently special info for only for SI_ACPI address sources is

returned.  Others may be added as necessary.

Note that the dev pointer is included in the above structure, and

assuming ipmi_smi_get_info returns success, you must call put_device

on the dev pointer.

Watchdog

--------

                     APEI output format

                     ~~~~~~~~~~~~~~~~~~

APEI uses printk as hardware error reporting interface, the output

format is as follow.

<error record> :=

APEI generic hardware error status

severity: <integer>, <severity string>

section: <integer>, severity: <integer>, <severity string>

flags: <integer>

<section flags strings>

fru_id: <uuid string>

fru_text: <string>

section_type: <section type string>

<section data>

<severity string>* := recoverable | fatal | corrected | info

<section flags strings># :=

[primary][, containment warning][, reset][, threshold exceeded]\

[, resource not accessible][, latent error]

<section type string> := generic processor error | memory error | \

PCIe error | unknown, <uuid string>

<section data> :=

<generic processor section data> | <memory section data> | \

<pcie section data> | <null>

<generic processor section data> :=

[processor_type: <integer>, <proc type string>]

[processor_isa: <integer>, <proc isa string>]

[error_type: <integer>

<proc error type strings>]

[operation: <integer>, <proc operation string>]

[flags: <integer>

<proc flags strings>]

[level: <integer>]

[version_info: <integer>]

[processor_id: <integer>]

[target_address: <integer>]

[requestor_id: <integer>]

[responder_id: <integer>]

[IP: <integer>]

<proc type string>* := IA32/X64 | IA64

<proc isa string>* := IA32 | IA64 | X64

<processor error type strings># :=

[cache error][, TLB error][, bus error][, micro-architectural error]

<proc operation string>* := unknown or generic | data read | data write | \

instruction execution

<proc flags strings># :=

[restartable][, precise IP][, overflow][, corrected]

<memory section data> :=

[error_status: <integer>]

[physical_address: <integer>]

[physical_address_mask: <integer>]

[node: <integer>]

[card: <integer>]

[module: <integer>]

[bank: <integer>]

[device: <integer>]

[row: <integer>]

[column: <integer>]

[bit_position: <integer>]

[requestor_id: <integer>]

[responder_id: <integer>]

[target_id: <integer>]

[error_type: <integer>, <mem error type string>]

<mem error type string>* :=

unknown | no error | single-bit ECC | multi-bit ECC | \

single-symbol chipkill ECC | multi-symbol chipkill ECC | master abort | \

target abort | parity error | watchdog timeout | invalid address | \

mirror Broken | memory sparing | scrub corrected error | \

scrub uncorrected error

<pcie section data> :=

[port_type: <integer>, <pcie port type string>]

[version: <integer>.<integer>]

[command: <integer>, status: <integer>]

[device_id: <integer>:<integer>:<integer>.<integer>

slot: <integer>

secondary_bus: <integer>

vendor_id: <integer>, device_id: <integer>

class_code: <integer>]

[serial number: <integer>, <integer>]

[bridge: secondary_status: <integer>, control: <integer>]

<pcie port type string>* := PCIe end point | legacy PCI end point | \

unknown | unknown | root port | upstream switch port | \

downstream switch port | PCIe to PCI/PCI-X bridge | \

PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \

root complex event collector

Where, [] designate corresponding content is optional

All <field string> description with * has the following format:

field: <integer>, <field string>

Where value of <integer> should be the position of "string" in <field

string> description. Otherwise, <field string> will be "unknown".

All <field strings> description with # has the following format:

field: <integer>

<field strings>

Where each string in <fields strings> corresponding to one set bit of

<integer>. The bit position is the position of "string" in <field

strings> description.

For more detailed explanation of every field, please refer to UEFI

specification version 2.3 or later, section Appendix N: Common

Platform Error Record.

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

What:	CONFIG_ACPI_PROCFS_POWER

When:	2.6.39

Why:	sysfs I/F for ACPI power devices, including AC and Battery,

        has been working in upstream kenrel since 2.6.24, Sep 2007.

	In 2.6.37, we make the sysfs I/F always built in and this option

	disabled by default.

	Remove this option and the ACPI power procfs interface in 2.6.39.

Who:	Zhang Rui <rui.zhang@intel.com>

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

What:	/proc/acpi/button

When:	August 2007

Why:	/proc/acpi/button has been replaced by events to the input layer

			unusable.  The "log_buf_len" parameter may be useful

			if you need to capture more output.

	acpi_display_output=	[HW,ACPI]

			acpi_display_output=vendor

			acpi_display_output=video

			See above.

	acpi_irq_balance [HW,ACPI]

			ACPI will balance active IRQs

			default in APIC mode