Skip to content

Commit

Permalink
Merge tag 'v3.9-rc5' into devel
Browse files Browse the repository at this point in the history 
Linux 3.9-rc5

Conflicts:
	drivers/pinctrl/pinconf.c
  • Loading branch information
@linusw
linusw committed Apr 3, 2013
2 parents 661462f + 07961ac commit 6a7b3e9
Show file tree
Hide file tree
Showing 1,121 changed files with 12,782 additions and 6,044 deletions.
14 changes: 11 additions & 3 deletions CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061
S: USA

N: Randy Dunlap
E: [email protected]
W: http://www.xenotime.net/linux/linux.html
W: http://www.linux-usb.org
E: [email protected]
W: http://www.infradead.org/~rdunlap/
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: x86 SMP, ACPI, bootflag hacking
D: documentation, builds
S: (ask for current address)
S: USA

Expand Down Expand Up @@ -1510,6 +1510,14 @@ D: Natsemi ethernet
D: Cobalt Networks (x86) support
D: This-and-That

N: Mark M. Hoffman
E: [email protected]
D: asb100, lm93 and smsc47b397 hardware monitoring drivers
D: hwmon subsystem core
D: hwmon subsystem maintainer
D: i2c-sis96x and i2c-stub SMBus drivers
S: USA

N: Dirk Hohndel
E: [email protected]
D: The XFree86[tm] Project
Expand Down
3 changes: 1 addition & 2 deletions Documentation/SubmittingPatches
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ own source tree. For example:
"dontdiff" is a list of files which are generated by the kernel during
the build process, and should be ignored in any diff(1)-generated
patch. The "dontdiff" file is included in the kernel tree in
2.6.12 and later. For earlier kernel versions, you can get it
from <http://www.xenotime.net/linux/doc/dontdiff>.
2.6.12 and later.

Make sure your patch does not include any extra files which do not
belong in a patch submission. Make sure to review your patch -after-
Expand Down
44 changes: 37 additions & 7 deletions Documentation/device-mapper/dm-raid.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The target is named "raid" and it accepts the following parameters:
raid10 Various RAID10 inspired algorithms chosen by additional params
- RAID10: Striped Mirrors (aka 'Striping on top of mirrors')
- RAID1E: Integrated Adjacent Stripe Mirroring
- RAID1E: Integrated Offset Stripe Mirroring
- and other similar RAID10 variants

Reference: Chapter 4 of
Expand Down Expand Up @@ -64,15 +65,15 @@ The target is named "raid" and it accepts the following parameters:
synchronisation state for each region.

[raid10_copies <# copies>]
[raid10_format near]
[raid10_format <near|far|offset>]
These two options are used to alter the default layout of
a RAID10 configuration. The number of copies is can be
specified, but the default is 2. There are other variations
to how the copies are laid down - the default and only current
option is "near". Near copies are what most people think of
with respect to mirroring. If these options are left
unspecified, or 'raid10_copies 2' and/or 'raid10_format near'
are given, then the layouts for 2, 3 and 4 devices are:
specified, but the default is 2. There are also three
variations to how the copies are laid down - the default
is "near". Near copies are what most people think of with
respect to mirroring. If these options are left unspecified,
or 'raid10_copies 2' and/or 'raid10_format near' are given,
then the layouts for 2, 3 and 4 devices are:
2 drives 3 drives 4 drives
-------- ---------- --------------
A1 A1 A1 A1 A2 A1 A1 A2 A2
Expand All @@ -85,6 +86,33 @@ The target is named "raid" and it accepts the following parameters:
3-device layout is what might be called a 'RAID1E - Integrated
Adjacent Stripe Mirroring'.

If 'raid10_copies 2' and 'raid10_format far', then the layouts
for 2, 3 and 4 devices are:
2 drives 3 drives 4 drives
-------- -------------- --------------------
A1 A2 A1 A2 A3 A1 A2 A3 A4
A3 A4 A4 A5 A6 A5 A6 A7 A8
A5 A6 A7 A8 A9 A9 A10 A11 A12
.. .. .. .. .. .. .. .. ..
A2 A1 A3 A1 A2 A2 A1 A4 A3
A4 A3 A6 A4 A5 A6 A5 A8 A7
A6 A5 A9 A7 A8 A10 A9 A12 A11
.. .. .. .. .. .. .. .. ..

If 'raid10_copies 2' and 'raid10_format offset', then the
layouts for 2, 3 and 4 devices are:
2 drives 3 drives 4 drives
-------- ------------ -----------------
A1 A2 A1 A2 A3 A1 A2 A3 A4
A2 A1 A3 A1 A2 A2 A1 A4 A3
A3 A4 A4 A5 A6 A5 A6 A7 A8
A4 A3 A6 A4 A5 A6 A5 A8 A7
A5 A6 A7 A8 A9 A9 A10 A11 A12
A6 A5 A9 A7 A8 A10 A9 A12 A11
.. .. .. .. .. .. .. .. ..
Here we see layouts closely akin to 'RAID1E - Integrated
Offset Stripe Mirroring'.

<#raid_devs>: The number of devices composing the array.
Each device consists of two entries. The first is the device
containing the metadata (if any); the second is the one containing the
Expand Down Expand Up @@ -142,3 +170,5 @@ Version History
1.3.0 Added support for RAID 10
1.3.1 Allow device replacement/rebuild for RAID 10
1.3.2 Fix/improve redundancy checking for RAID10
1.4.0 Non-functional change. Removes arg from mapping function.
1.4.1 Add RAID10 "far" and "offset" algorithm support.
6 changes: 1 addition & 5 deletions Documentation/devicetree/bindings/mfd/ab8500.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ Required parent device properties:
4 = active high level-sensitive
8 = active low level-sensitive

Optional parent device properties:
- reg : contains the PRCMU mailbox address for the AB8500 i2c port

The AB8500 consists of a large and varied group of sub-devices:

Device IRQ Names Supply Names Description
Expand Down Expand Up @@ -86,9 +83,8 @@ Non-standard child device properties:
- stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic
- stericsson,earpeice-cmv : Earpeice voltage (only: 950 | 1100 | 1270 | 1580)

ab8500@5 {
ab8500 {
compatible = "stericsson,ab8500";
reg = <5>; /* mailbox 5 is i2c */
interrupts = <0 40 0x4>;
interrupt-controller;
#interrupt-cells = <2>;
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/tty/serial/of-serial.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Required properties:
- "nvidia,tegra20-uart"
- "nxp,lpc3220-uart"
- "ibm,qpace-nwp-serial"
- "altr,16550-FIFO32"
- "altr,16550-FIFO64"
- "altr,16550-FIFO128"
- "serial" if the port type is unknown.
- reg : offset and length of the register set for the device.
- interrupts : should contain uart interrupt.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm1275
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Supported chips:
Addresses scanned: -
Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
11 changes: 10 additions & 1 deletion Documentation/hwmon/adt7410
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ Kernel driver adt7410
Supported chips:
* Analog Devices ADT7410
Prefix: 'adt7410'
Addresses scanned: I2C 0x48 - 0x4B
Addresses scanned: None
Datasheet: Publicly available at the Analog Devices website
http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
* Analog Devices ADT7420
Prefix: 'adt7420'
Addresses scanned: None
Datasheet: Publicly available at the Analog Devices website
http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf

Author: Hartmut Knaack <[email protected]>

Expand All @@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving.
Besides, it can completely power down its ADC, if power management is
required.

The ADT7420 is register compatible, the only differences being the package,
a slightly narrower operating temperature range (-40°C to +150°C), and a
better accuracy (0.25°C instead of 0.50°C.)

Configuration Notes
-------------------

Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/jc42
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Supported chips:
Addresses scanned: I2C 0x18 - 0x1f

Author:
Guenter Roeck <[email protected]>
Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lineage-pem
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Supported devices:
Documentation:
http://www.lineagepower.com/oem/pdf/CPLI2C.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm25066
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Supported chips:
Datasheet:
http://www.national.com/pf/LM/LM5066.html

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm75
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Supported chips:
Datasheet: Publicly available at the Maxim website
http://www.maxim-ic.com/
* Microchip (TelCom) TCN75
Prefix: 'lm75'
Prefix: 'tcn75'
Addresses scanned: none
Datasheet: Publicly available at the Microchip website
http://www.microchip.com/
Expand Down
6 changes: 3 additions & 3 deletions Documentation/hwmon/ltc2978
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Supported chips:
* Linear Technology LTC2978
Prefix: 'ltc2978'
Addresses scanned: -
Datasheet: http://cds.linear.com/docs/Datasheet/2978fa.pdf
Datasheet: http://www.linear.com/product/ltc2978
* Linear Technology LTC3880
Prefix: 'ltc3880'
Addresses scanned: -
Datasheet: http://cds.linear.com/docs/Datasheet/3880f.pdf
Datasheet: http://www.linear.com/product/ltc3880

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ltc4261
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Supported chips:
Datasheet:
http://cds.linear.com/docs/Datasheet/42612fb.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/max16064
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: -
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX16064.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/max16065
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Supported chips:
http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf


Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/max34440
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Supported chips:
Addresses scanned: -
Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34461.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/max8688
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: -
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX8688.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/pmbus
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Supported chips:
Addresses scanned: -
Datasheet: n.a.

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/smm665
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Supported chips:
http://www.summitmicro.com/prod_select/summary/SMM766/SMM766_2086.pdf
http://www.summitmicro.com/prod_select/summary/SMM766B/SMM766B_2122.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Module Parameters
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ucd9000
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Supported chips:
http://focus.ti.com/lit/ds/symlink/ucd9090.pdf
http://focus.ti.com/lit/ds/symlink/ucd90910.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ucd9200
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Supported chips:
http://focus.ti.com/lit/ds/symlink/ucd9246.pdf
http://focus.ti.com/lit/ds/symlink/ucd9248.pdf

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/zl6100
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146401
http://archive.ericsson.net/service/internet/picov/get?DocNo=28701-EN/LZT146256


Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-diolan-u2c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Supported adapters:
Documentation:
http://www.diolan.com/i2c/u2c12.html

Author: Guenter Roeck <[email protected]>
Author: Guenter Roeck <[email protected]>

Description
-----------
Expand Down
Loading

0 comments on commit 6a7b3e9

Please sign in to comment.