Commit 7de5d895 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Merge reason: pick up perf fixes

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 04fba671 502adf57

Documentation/DocBook/kernel-locking.tmpl

+5 −2
Original line number Diff line number Diff line
@@ -1922,9 +1922,12 @@ machines due to caching. 
      <function>mutex_lock()</function>

      </para>

      <para>

       There is a <function>mutex_trylock()</function> which can be

       used inside interrupt context, as it will not sleep.

       There is a <function>mutex_trylock()</function> which does not

       sleep.  Still, it must not be used inside interrupt context since

       its implementation is not safe for that.

       <function>mutex_unlock()</function> will also never sleep.

       It cannot be used in interrupt context either since a mutex

       must be released by the same task that acquired it.

      </para>

     </listitem>

    </itemizedlist>

Documentation/hwmon/f71882fg

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ Kernel driver f71882fg 
======================



Supported chips:

  * Fintek F71808E

    Prefix: 'f71808fg'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Not public

  * Fintek F71858FG

    Prefix: 'f71858fg'

    Addresses scanned: none, address read from Super I/O config space

Documentation/kernel-parameters.txt

+4 −2
Original line number Diff line number Diff line
@@ -2629,8 +2629,10 @@ and is between 256 and 4096 characters. It is defined in the file 
			aux-ide-disks -- unplug non-primary-master IDE devices

			nics -- unplug network devices

			all -- unplug all emulated devices (NICs and IDE disks)

			ignore -- continue loading the Xen platform PCI driver even

				if the version check failed

			unnecessary -- unplugging emulated devices is

				unnecessary even if the host did not respond to

				the unplug protocol

			never -- do not unplug even if version check succeeds



	xirc2ps_cs=	[NET,PCMCIA]

			Format:

Documentation/laptops/thinkpad-acpi.txt

+4 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,10 @@ ThinkPad-specific interface. The driver will disable its native 
backlight brightness control interface if it detects that the standard

ACPI interface is available in the ThinkPad.



If you want to use the thinkpad-acpi backlight brightness control

instead of the generic ACPI video backlight brightness control for some

reason, you should use the acpi_backlight=vendor kernel parameter.



The brightness_enable module parameter can be used to control whether

the LCD brightness control feature will be enabled when available.

brightness_enable=0 forces it to be disabled.  brightness_enable=1

Documentation/powerpc/booting-without-of.txt

+2 −29
Original line number Diff line number Diff line
@@ -49,40 +49,13 @@ Table of Contents 
      f) MDIO on GPIOs

      g) SPI busses



  VII - Marvell Discovery mv64[345]6x System Controller chips

    1) The /system-controller node

    2) Child nodes of /system-controller

      a) Marvell Discovery MDIO bus

      b) Marvell Discovery ethernet controller

      c) Marvell Discovery PHY nodes

      d) Marvell Discovery SDMA nodes

      e) Marvell Discovery BRG nodes

      f) Marvell Discovery CUNIT nodes

      g) Marvell Discovery MPSCROUTING nodes

      h) Marvell Discovery MPSCINTR nodes

      i) Marvell Discovery MPSC nodes

      j) Marvell Discovery Watch Dog Timer nodes

      k) Marvell Discovery I2C nodes

      l) Marvell Discovery PIC (Programmable Interrupt Controller) nodes

      m) Marvell Discovery MPP (Multipurpose Pins) multiplexing nodes

      n) Marvell Discovery GPP (General Purpose Pins) nodes

      o) Marvell Discovery PCI host bridge node

      p) Marvell Discovery CPU Error nodes

      q) Marvell Discovery SRAM Controller nodes

      r) Marvell Discovery PCI Error Handler nodes

      s) Marvell Discovery Memory Controller nodes



  VIII - Specifying interrupt information for devices

  VII - Specifying interrupt information for devices

    1) interrupts property

    2) interrupt-parent property

    3) OpenPIC Interrupt Controllers

    4) ISA Interrupt Controllers



  IX - Specifying GPIO information for devices

    1) gpios property

    2) gpio-controller nodes



  X - Specifying device power management information (sleep property)

  VIII - Specifying device power management information (sleep property)



  Appendix A - Sample SOC node for MPC8540