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

Commit 5fef06e8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into genirq

parents 0c5d1eb7 278429cf

Documentation/00-INDEX

+0 −4
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ hayes-esp.txt 
	- info on using the Hayes ESP serial driver.

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hpet.txt

	- High Precision Event Timer Driver for Linux.

timers/

	- info on the timer related topics

hw_random.txt
@@ -251,8 +249,6 @@ mono.txt 
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

mtrr.txt

	- how to use PPro Memory Type Range Registers to increase performance.

mutex-design.txt

	- info on the generic mutex subsystem.

namespaces/

Documentation/ABI/testing/sysfs-class-regulator

+34 −21
Original line number Diff line number Diff line 
What:		/sys/class/regulator/.../state

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		state. This holds the regulator output state.
@@ -27,7 +27,7 @@ Description: 
What:		/sys/class/regulator/.../type

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		type. This holds the regulator type.
@@ -51,7 +51,7 @@ Description: 
What:		/sys/class/regulator/.../microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		microvolts. This holds the regulator output voltage setting
@@ -65,7 +65,7 @@ Description: 
What:		/sys/class/regulator/.../microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		microamps. This holds the regulator output current limit
@@ -79,7 +79,7 @@ Description: 
What:		/sys/class/regulator/.../opmode

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		opmode. This holds the regulator operating mode setting.
@@ -102,7 +102,7 @@ Description: 
What:		/sys/class/regulator/.../min_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		min_microvolts. This holds the minimum safe working regulator
@@ -116,7 +116,7 @@ Description: 
What:		/sys/class/regulator/.../max_microvolts

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		max_microvolts. This holds the maximum safe working regulator
@@ -130,7 +130,7 @@ Description: 
What:		/sys/class/regulator/.../min_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		min_microamps. This holds the minimum safe working regulator
@@ -145,7 +145,7 @@ Description: 
What:		/sys/class/regulator/.../max_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		max_microamps. This holds the maximum safe working regulator
@@ -157,10 +157,23 @@ Description: 
		platform code.





What:		/sys/class/regulator/.../name

Date:		October 2008

KernelVersion:	2.6.28

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		name. This holds a string identifying the regulator for

		display purposes.



		NOTE: this will be empty if no suitable name is provided

		by platform or regulator drivers.





What:		/sys/class/regulator/.../num_users

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		num_users. This holds the number of consumer devices that
@@ -170,7 +183,7 @@ Description: 
What:		/sys/class/regulator/.../requested_microamps

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		requested_microamps. This holds the total requested load
@@ -181,7 +194,7 @@ Description: 
What:		/sys/class/regulator/.../parent

Date:		April 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Some regulator directories will contain a link called parent.

		This points to the parent or supply regulator if one exists.
@@ -189,7 +202,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_microvolts. This holds the regulator output
@@ -203,7 +216,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_microvolts. This holds the regulator output
@@ -217,7 +230,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_microvolts

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_microvolts. This holds the regulator output
@@ -231,7 +244,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_mode. This holds the regulator operating mode
@@ -245,7 +258,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_mode. This holds the regulator operating mode
@@ -258,7 +271,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_mode

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_mode. This holds the regulator operating mode
@@ -272,7 +285,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_mem_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_mem_state. This holds the regulator operating state
@@ -287,7 +300,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_disk_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_disk_state. This holds the regulator operating state
@@ -302,7 +315,7 @@ Description: 
What:		/sys/class/regulator/.../suspend_standby_state

Date:		May 2008

KernelVersion:	2.6.26

Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>

Contact:	Liam Girdwood <lrg@slimlogic.co.uk>

Description:

		Each regulator directory will contain a field called

		suspend_standby_state. This holds the regulator operating

Documentation/DMA-API.txt

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this: 
	int i, count = dma_map_sg(dev, sglist, nents, direction);

	struct scatterlist *sg;



	for (i = 0, sg = sglist; i < count; i++, sg++) {

	for_each_sg(sglist, sg, count, i) {

		hw_address[i] = sg_dma_address(sg);

		hw_len[i] = sg_dma_len(sg);

	}

Documentation/DocBook/kernel-api.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ X!Earch/x86/kernel/mca_32.c 
  <chapter id="security">

     <title>Security Framework</title>

!Isecurity/security.c

!Esecurity/inode.c

  </chapter>



  <chapter id="audit">
@@ -364,6 +365,10 @@ X!Edrivers/pnp/system.c 
!Eblock/blk-barrier.c

!Eblock/blk-tag.c

!Iblock/blk-tag.c

!Eblock/blk-integrity.c

!Iblock/blktrace.c

!Iblock/genhd.c

!Eblock/genhd.c

  </chapter>



  <chapter id="chrdev">

Documentation/DocBook/mac80211.tmpl

+4 −8
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ usage should require reading the full document. 
        this though and the recommendation to allow only a single

        interface in STA mode at first!

      </para>

!Finclude/net/mac80211.h ieee80211_if_types

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_if_conf

    </chapter>
@@ -177,8 +176,7 @@ usage should require reading the full document. 
        <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h ieee80211_tx_control

!Finclude/net/mac80211.h ieee80211_tx_status_flags

!Finclude/net/mac80211.h ieee80211_tx_info

!Finclude/net/mac80211.h ieee80211_rx

!Finclude/net/mac80211.h ieee80211_rx_irqsafe

!Finclude/net/mac80211.h ieee80211_tx_status
@@ -189,12 +187,11 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_get_hdrlen

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_start_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

      </sect1>

    </chapter>
@@ -230,8 +227,7 @@ usage should require reading the full document. 
      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_tx_queue_params

!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data

!Finclude/net/mac80211.h ieee80211_tx_queue

!Finclude/net/mac80211.h ieee80211_tx_queue_stats

    </chapter>



    <chapter id="AP">