Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd593acc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.3-rc7' into x86/mce 



Merge reason: Update from an ancient -rc1 base to an almost-final stable kernel.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 11b91d6f fde7d904

Documentation/DocBook/device-drivers.tmpl

+10 −2
Original line number Diff line number Diff line
@@ -102,9 +102,12 @@ X!Iinclude/linux/kobject.h 
!Iinclude/linux/device.h

     </sect1>

     <sect1><title>Device Drivers Base</title>

!Idrivers/base/init.c

!Edrivers/base/driver.c

!Edrivers/base/core.c

!Edrivers/base/syscore.c

!Edrivers/base/class.c

!Idrivers/base/node.c

!Edrivers/base/firmware_class.c

!Edrivers/base/transport_class.c

<!-- Cannot be included, because
@@ -113,13 +116,18 @@ X!Iinclude/linux/kobject.h 
     exceed allowed 44 characters maximum

X!Edrivers/base/attribute_container.c

-->

!Edrivers/base/sys.c

!Edrivers/base/dd.c

<!--

X!Edrivers/base/interface.c

-->

!Iinclude/linux/platform_device.h

!Edrivers/base/platform.c

!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-buf.c

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

     <sect1><title>Device Drivers Power Management</title>

!Edrivers/base/power/main.c
@@ -219,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.c

!Edrivers/tty/serial/8250/8250.c

  </chapter>



  <chapter id="fbdev">

Documentation/devicetree/bindings/gpio/led.txt

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ Each LED is represented as a sub-node of the gpio-leds device. Each 
node's name represents the name of the corresponding LED.



LED sub-node properties:

- gpios :  Should specify the LED's GPIO, see "Specifying GPIO information

  for devices" in Documentation/devicetree/booting-without-of.txt.  Active

  low LEDs should be indicated using flags in the GPIO specifier.

- gpios :  Should specify the LED's GPIO, see "gpios property" in

  Documentation/devicetree/gpio.txt.  Active low LEDs should be

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

- linux,default-trigger :  (optional) This parameter, if present, is a

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ national National Semiconductor 
nintendo	Nintendo

nvidia	NVIDIA

nxp	NXP Semiconductors

picochip	Picochip Ltd

powervr	Imagination Technologies

qcom	Qualcomm, Inc.

ramtron	Ramtron International

Documentation/driver-model/devres.txt

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ certainly invest a bit more effort into libata core layer). 
  6. List of managed interfaces

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



MEM

  devm_kzalloc()

  devm_kfree()



IO region

  devm_request_region()

  devm_request_mem_region()

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Diff line number Diff line
@@ -510,3 +510,17 @@ Why: The pci_scan_bus_parented() interface creates a new root bus. The 
	convert to using pci_scan_root_bus() so they can supply a list of

	bus resources when the bus is created.

Who:	Bjorn Helgaas <bhelgaas@google.com>



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



What:	The CAP9 SoC family will be removed

When:	3.4

Files:	arch/arm/mach-at91/at91cap9.c

	arch/arm/mach-at91/at91cap9_devices.c

	arch/arm/mach-at91/include/mach/at91cap9.h

	arch/arm/mach-at91/include/mach/at91cap9_matrix.h

	arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h

	arch/arm/mach-at91/board-cap9adk.c

Why:	The code is not actively maintained and platforms are now hard to find.

Who:	Nicolas Ferre <nicolas.ferre@atmel.com>

	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>