Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 369836
b: refs/heads/master
c: faff7f7
h: refs/heads/master
v: v3
  • Loading branch information
Gustavo Padovan committed Apr 18, 2013
1 parent 3f2402e commit ac6d261
Show file tree
Hide file tree
Showing 2,468 changed files with 37,591 additions and 67,880 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b807a3d688c7b1da86662b220ace548389c48167
refs/heads/master: faff7f74d2f945527ef92d68e501d9e8adaca750
14 changes: 3 additions & 11 deletions trunk/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: rdunlap@infradead.org
W: http://www.infradead.org/~rdunlap/
E: rdunlap@xenotime.net
W: http://www.xenotime.net/linux/linux.html
W: http://www.linux-usb.org
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,14 +1510,6 @@ D: Natsemi ethernet
D: Cobalt Networks (x86) support
D: This-and-That

N: Mark M. Hoffman
E: mhoffman@lightlink.com
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: hohndel@suse.de
D: The XFree86[tm] Project
Expand Down
8 changes: 0 additions & 8 deletions trunk/Documentation/ABI/testing/sysfs-class-net-mesh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ Description:
Defines the penalty which will be applied to an
originator message's tq-field on every hop.

What: /sys/class/net/<mesh_iface>/mesh/network_coding
Date: Nov 2012
Contact: Martin Hundeboll <martin@hundeboll.net>
Description:
Controls whether Network Coding (using some magic
to send fewer wifi packets but still the same
content) is enabled or not.

What: /sys/class/net/<mesh_iface>/mesh/orig_interval
Date: May 2010
Contact: Marek Lindner <lindner_marek@yahoo.de>
Expand Down
2 changes: 1 addition & 1 deletion trunk/Documentation/DocBook/device-drivers.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
<chapter id="uart16x50">
<title>16x50 UART Driver</title>
!Edrivers/tty/serial/serial_core.c
!Edrivers/tty/serial/8250/8250_core.c
!Edrivers/tty/serial/8250/8250.c
</chapter>

<chapter id="fbdev">
Expand Down
3 changes: 2 additions & 1 deletion trunk/Documentation/SubmittingPatches
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ 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.
2.6.12 and later. For earlier kernel versions, you can get it
from <http://www.xenotime.net/linux/doc/dontdiff>.

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
2 changes: 0 additions & 2 deletions trunk/Documentation/cgroups/00-INDEX
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ memcg_test.txt
- Memory Resource Controller; implementation details.
memory.txt
- Memory Resource Controller; design, accounting, interface, testing.
net_cls.txt
- Network classifier cgroups details and usages.
net_prio.txt
- Network priority cgroups details and usages.
resource_counter.txt
Expand Down
34 changes: 0 additions & 34 deletions trunk/Documentation/cgroups/net_cls.txt
View file

This file was deleted.

3 changes: 0 additions & 3 deletions trunk/Documentation/devicetree/bindings/marvell.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
- compatible : "marvell,mv64360-eth-block"
- reg : Offset and length of the register set for this block

Optional properties:
- clocks : Phandle to the clock control device and gate bit

Example Discovery Ethernet block node:
ethernet-block@2000 {
#address-cells = <1>;
Expand Down
6 changes: 5 additions & 1 deletion trunk/Documentation/devicetree/bindings/mfd/ab8500.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ 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 @@ -83,8 +86,9 @@ 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 {
ab8500@5 {
compatible = "stericsson,ab8500";
reg = <5>; /* mailbox 5 is i2c */
interrupts = <0 40 0x4>;
interrupt-controller;
#interrupt-cells = <2>;
Expand Down
14 changes: 0 additions & 14 deletions trunk/Documentation/devicetree/bindings/net/can/atmel-can.txt
View file

This file was deleted.

16 changes: 5 additions & 11 deletions trunk/Documentation/devicetree/bindings/net/cpsw.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,16 @@ Required properties:
- mac_control : Specifies Default MAC control register content
for the specific platform
- slaves : Specifies number for slaves
- active_slave : Specifies the slave to use for time stamping,
ethtool and SIOCGMIIPHY
- cpts_active_slave : Specifies the slave to use for time stamping
- cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds
- cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds
- phy_id : Specifies slave phy id
- mac-address : Specifies slave MAC address

Optional properties:
- ti,hwmods : Must be "cpgmac0"
- no_bd_ram : Must be 0 or 1
- dual_emac : Specifies Switch to act as Dual EMAC

Slave Properties:
Required properties:
- phy_id : Specifies slave phy id
- mac-address : Specifies slave MAC address

Optional properties:
- dual_emac_res_vlan : Specifies VID to be used to segregate the ports

Note: "ti,hwmods" field is used to fetch the base address and irq
Expand All @@ -53,7 +47,7 @@ Examples:
rx_descs = <64>;
mac_control = <0x20>;
slaves = <2>;
active_slave = <0>;
cpts_active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
cpsw_emac0: slave@0 {
Expand All @@ -79,7 +73,7 @@ Examples:
rx_descs = <64>;
mac_control = <0x20>;
slaves = <2>;
active_slave = <0>;
cpts_active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
cpsw_emac0: slave@0 {
Expand Down
91 changes: 0 additions & 91 deletions trunk/Documentation/devicetree/bindings/net/dsa/dsa.txt
View file

This file was deleted.

4 changes: 0 additions & 4 deletions trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ Required properties:
- compatible: "marvell,orion-mdio"
- reg: address and length of the SMI register

Optional properties:
- interrupts: interrupt line number for the SMI error/done interrupt
- clocks: Phandle to the clock control device and gate bit

The child nodes of the MDIO driver are the individual PHY devices
connected to this MDIO bus. They must have a "reg" property given the
PHY address on the MDIO bus.
Expand Down
3 changes: 0 additions & 3 deletions trunk/Documentation/devicetree/bindings/tty/serial/of-serial.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ 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 trunk/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 <linux@roeck-us.net>
Author: Guenter Roeck <guenter.roeck@ericsson.com>


Description
Expand Down
11 changes: 1 addition & 10 deletions trunk/Documentation/hwmon/adt7410
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@ Kernel driver adt7410
Supported chips:
* Analog Devices ADT7410
Prefix: 'adt7410'
Addresses scanned: None
Addresses scanned: I2C 0x48 - 0x4B
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 <knaack.h@gmx.de>

Expand All @@ -32,10 +27,6 @@ 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 trunk/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 <linux@roeck-us.net>
Guenter Roeck <guenter.roeck@ericsson.com>


Description
Expand Down
2 changes: 1 addition & 1 deletion trunk/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 <linux@roeck-us.net>
Author: Guenter Roeck <guenter.roeck@ericsson.com>


Description
Expand Down
2 changes: 1 addition & 1 deletion trunk/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 <linux@roeck-us.net>
Author: Guenter Roeck <guenter.roeck@ericsson.com>


Description
Expand Down
2 changes: 1 addition & 1 deletion trunk/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: 'tcn75'
Prefix: 'lm75'
Addresses scanned: none
Datasheet: Publicly available at the Microchip website
http://www.microchip.com/
Expand Down
Loading

0 comments on commit ac6d261

Please sign in to comment.