Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

		multiple) files based on the record size of the underlying

		persistent storage until at least this amount is reached.

		Default is 10 Kbytes.

		Pstore only supports one backend at a time. If multiple

		backends are available, the preferred backend may be

		set by passing the pstore.backend= argument to the kernel at

		boot time.

Contact:	"Ike Panhc <ike.pan@canonical.com>"

Description:

		Control the power of camera module. 1 means on, 0 means off.

What:		/sys/devices/platform/ideapad/cfg

Date:		Jun 2011

KernelVersion:	3.1

Contact:	"Ike Panhc <ike.pan@canonical.com>"

Description:

		Ideapad capability bits.

		Bit 8-10: 1 - Intel graphic only

		          2 - ATI graphic only

		          3 - Nvidia graphic only

		          4 - Intel and ATI graphic

		          5 - Intel and Nvidia graphic

		Bit 16: Bluetooth exist (1 for exist)

		Bit 17: 3G exist (1 for exist)

		Bit 18: Wifi exist (1 for exist)

		Bit 19: Camera exist (1 for exist)

The limit on the length of lines is 80 columns and this is a strongly

preferred limit.

Statements longer than 80 columns will be broken into sensible chunks.

Descendants are always substantially shorter than the parent and are placed

substantially to the right. The same applies to function headers with a long

argument list. Long strings are as well broken into shorter strings. The

only exception to this is where exceeding 80 columns significantly increases

readability and does not hide information.

void fun(int a, int b, int c)

{

	if (condition)

		printk(KERN_WARNING "Warning this is a long printk with "

						"3 parameters a: %u b: %u "

						"c: %u \n", a, b, c);

	else

		next_statement;

}

Statements longer than 80 columns will be broken into sensible chunks, unless

exceeding 80 columns significantly increases readability and does not hide

information. Descendants are always substantially shorter than the parent and

are placed substantially to the right. The same applies to function headers

with a long argument list. However, never break user-visible strings such as

printk messages, because that breaks the ability to grep for them.

		Chapter 3: Placing Braces and Spaces

- param1

  This file is used to set the first error parameter value. Effect of

  parameter depends on error_type specified. For memory error, this is

  physical memory address.

  physical memory address.  Only available if param_extension module

  parameter is specified.

- param2

  This file is used to set the second error parameter value. Effect of

  parameter depends on error_type specified. For memory error, this is

  physical memory address mask.

  physical memory address mask.  Only available if param_extension

  module parameter is specified.

Injecting parameter support is a BIOS version specific extension, that

is, it only works on some BIOS version.  If you want to use it, please

make sure your BIOS version has the proper support and specify

"param_extension=y" in module parameter.

For more information about EINJ, please refer to ACPI specification

version 4.0, section 17.5.

Device-Mapper's "crypt" target provides transparent encryption of block devices

using the kernel crypto API.

Parameters: <cipher> <key> <iv_offset> <device path> <offset>

Parameters: <cipher> <key> <iv_offset> <device path> \

	      <offset> [<#opt_params> <opt_params>]

<cipher>

    Encryption cipher and an optional IV generation mode.

<offset>

    Starting sector within the device where the encrypted data begins.

<#opt_params>

    Number of optional parameters. If there are no optional parameters,

    the optional paramaters section can be skipped or #opt_params can be zero.

    Otherwise #opt_params is the number of following arguments.

    Example of optional parameters section:

        1 allow_discards

allow_discards

    Block discard requests (a.k.a. TRIM) are passed through the crypt device.

    The default is to ignore discard requests.

    WARNING: Assess the specific security risks carefully before enabling this

    option.  For example, allowing discards on encrypted devices may lead to

    the leak of information about the ciphertext device (filesystem type,

    used space etc.) if the discarded blocks can be located easily on the

    device later.

Example scripts

===============

LUKS (Linux Unified Key Setup) is now the preferred way to set up disk