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

Commit dff243f7 authored by David Vrabel's avatar David Vrabel
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
parents a5e6ced5 f3b8436a

CREDITS

+22 −8
Original line number Diff line number Diff line
@@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr. 
S: Nampa, Idaho 83686

S: USA



N: Dirk J. Brandewie

E: dirk.j.brandewie@intel.com

E: linux-wimax@intel.com

D: Intel Wireless WiMAX Connection 2400 SDIO driver



N: Derrick J. Brashear

E: shadow@dementia.org

W: http://www.dementia.org/~shadow
@@ -1681,7 +1686,7 @@ E: ajoshi@shell.unixbox.com 
D: fbdev hacking



N: Jesper Juhl

E: jesper.juhl@gmail.com

E: jj@chaosbits.net

D: Various fixes, cleanups and minor features all over the tree.

D: Wrote initial version of the hdaps driver (since passed on to others).

S: Lemnosvej 1, 3.tv
@@ -2119,6 +2124,11 @@ N: H.J. Lu 
E: hjl@gnu.ai.mit.edu

D: GCC + libraries hacker



N: Yanir Lubetkin

E: yanirx.lubatkin@intel.com

E: linux-wimax@intel.com

D: Intel Wireless WiMAX Connection 2400 driver



N: Michal Ludvig

E: michal@logix.cz

E: michal.ludvig@asterisk.co.nz
@@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road 
S: Thunder Bay, Ontario

S: CANADA P7C 5M9



N: Inaky Perez-Gonzalez

E: inaky.perez-gonzalez@intel.com

E: linux-wimax@intel.com

E: inakypg@yahoo.com

D: WiMAX stack

D: Intel Wireless WiMAX Connection 2400 driver



N: Yuri Per

E: yuri@pts.mipt.ru

D: Some smbfs fixes
@@ -3769,14 +3786,11 @@ S: The Netherlands 


N: David Woodhouse

E: dwmw2@infradead.org

D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,

D: some Alpha platform porting from 2.0, Memory Technology Devices,

D: Acquire watchdog timer, PC speaker driver maintenance,

D: JFFS2 file system, Memory Technology Device subsystem,

D: various other stuff that annoyed me by not working.

S: c/o Red Hat Engineering

S: Rustat House

S: 60 Clifton Road

S: Cambridge. CB1 7EG

S: c/o Intel Corporation

S: Pipers Way

S: Swindon. SN3 1RJ

S: England



N: Chris Wright

Documentation/ABI/testing/sysfs-class-regulator

+60 −76
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		state. This holds the regulator output state.

		Some regulator directories will contain a field called

		state. This reports the regulator enable status, for

		regulators which can report that value.



		This will be one of the following strings:
@@ -18,7 +19,8 @@ Description: 
		'disabled' means the regulator output is OFF and is not

		supplying power to the system..



		'unknown' means software cannot determine the state.

		'unknown' means software cannot determine the state, or

		the reported state is invalid.



		NOTE: this field can be used in conjunction with microvolts

		and microamps to determine regulator output levels.
@@ -53,9 +55,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		microvolts. This holds the regulator output voltage setting

		measured in microvolts (i.e. E-6 Volts).

		measured in microvolts (i.e. E-6 Volts), for regulators

		which can report that voltage.



		NOTE: This value should not be used to determine the regulator

		output voltage level as this value is the same regardless of
@@ -67,9 +70,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		microamps. This holds the regulator output current limit

		setting measured in microamps (i.e. E-6 Amps).

		setting measured in microamps (i.e. E-6 Amps), for regulators

		which can report that current.



		NOTE: This value should not be used to determine the regulator

		output current level as this value is the same regardless of
@@ -81,8 +85,9 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		opmode. This holds the regulator operating mode setting.

		Some regulator directories will contain a field called

		opmode. This holds the current regulator operating mode,

		for regulators which can report it.



		The opmode value can be one of the following strings:
@@ -92,7 +97,7 @@ Description: 
		'standby'

		'unknown'



		The modes are described in include/linux/regulator/regulator.h

		The modes are described in include/linux/regulator/consumer.h



		NOTE: This value should not be used to determine the regulator

		output operating mode as this value is the same regardless of
@@ -104,9 +109,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		min_microvolts. This holds the minimum safe working regulator

		output voltage setting for this domain measured in microvolts.

		output voltage setting for this domain measured in microvolts,

		for regulators which support voltage constraints.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no min microvolts constraint defined by
@@ -118,9 +124,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		max_microvolts. This holds the maximum safe working regulator

		output voltage setting for this domain measured in microvolts.

		output voltage setting for this domain measured in microvolts,

		for regulators which support voltage constraints.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no max microvolts constraint defined by
@@ -132,10 +139,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		min_microamps. This holds the minimum safe working regulator

		output current limit setting for this domain measured in

		microamps.

		microamps, for regulators which support current constraints.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no min microamps constraint defined by
@@ -147,10 +154,10 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		max_microamps. This holds the maximum safe working regulator

		output current limit setting for this domain measured in

		microamps.

		microamps, for regulators which support current constraints.



		NOTE: this will return the string 'constraint not defined' if

		the power domain has no max microamps constraint defined by
@@ -185,7 +192,7 @@ Date: April 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		requested_microamps. This holds the total requested load

		current in microamps for this regulator from all its consumer

		devices.
@@ -204,125 +211,102 @@ Date: May 2008 
KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_mem_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to memory.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to memory voltage defined by

		platform code.

		the system is suspended to memory, for voltage regulators

		implementing suspend voltage configuration constraints.



What:		/sys/class/regulator/.../suspend_disk_microvolts

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_disk_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to disk.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to disk voltage defined by

		platform code.

		the system is suspended to disk, for voltage regulators

		implementing suspend voltage configuration constraints.



What:		/sys/class/regulator/.../suspend_standby_microvolts

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_standby_microvolts. This holds the regulator output

		voltage setting for this domain measured in microvolts when

		the system is suspended to standby.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to standby voltage defined by

		platform code.

		the system is suspended to standby, for voltage regulators

		implementing suspend voltage configuration constraints.



What:		/sys/class/regulator/.../suspend_mem_mode

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_mem_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to

		memory.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to memory mode defined by

		platform code.

		memory, for regulators implementing suspend mode

		configuration constraints.



What:		/sys/class/regulator/.../suspend_disk_mode

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_disk_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to disk.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to disk mode defined by

		platform code.

		setting for this domain when the system is suspended to disk,

		for regulators implementing suspend mode configuration

		constraints.



What:		/sys/class/regulator/.../suspend_standby_mode

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_standby_mode. This holds the regulator operating mode

		setting for this domain when the system is suspended to

		standby.



		NOTE: this will return the string 'not defined' if

		the power domain has no suspend to standby mode defined by

		platform code.

		standby, for regulators implementing suspend mode

		configuration constraints.



What:		/sys/class/regulator/.../suspend_mem_state

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_mem_state. This holds the regulator operating state

		when suspended to memory.



		This will be one of the following strings:

		when suspended to memory, for regulators implementing suspend

		configuration constraints.



		'enabled'

		'disabled'

		'not defined'

		This will be one of the same strings reported by

		the "state" attribute.



What:		/sys/class/regulator/.../suspend_disk_state

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_disk_state. This holds the regulator operating state

		when suspended to disk.



		This will be one of the following strings:

		when suspended to disk, for regulators implementing

		suspend configuration constraints.



		'enabled'

		'disabled'

		'not defined'

		This will be one of the same strings reported by

		the "state" attribute.



What:		/sys/class/regulator/.../suspend_standby_state

Date:		May 2008

KernelVersion:	2.6.26

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

Description:

		Each regulator directory will contain a field called

		Some regulator directories will contain a field called

		suspend_standby_state. This holds the regulator operating

		state when suspended to standby.



		This will be one of the following strings:

		state when suspended to standby, for regulators implementing

		suspend configuration constraints.



		'enabled'

		'disabled'

		'not defined'
 
		This will be one of the same strings reported by

		the "state" attribute.

Documentation/DMA-API.txt

+4 −5
Original line number Diff line number Diff line
@@ -170,16 +170,15 @@ Returns: 0 if successful and a negative error if not. 
u64

dma_get_required_mask(struct device *dev)



After setting the mask with dma_set_mask(), this API returns the

actual mask (within that already set) that the platform actually

requires to operate efficiently.  Usually this means the returned mask

This API returns the mask that the platform requires to

operate efficiently.  Usually this means the returned mask

is the minimum required to cover all of memory.  Examining the

required mask gives drivers with variable descriptor sizes the

opportunity to use smaller descriptors as necessary.



Requesting the required mask does not alter the current mask.  If you

wish to take advantage of it, you should issue another dma_set_mask()

call to lower the mask again.

wish to take advantage of it, you should issue a dma_set_mask()

call to set the mask to the value returned.





Part Id - Streaming DMA mappings

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml mcabook.xml \ 
	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    mac80211.xml debugobjects.xml sh.xml

	    mac80211.xml debugobjects.xml sh.xml regulator.xml



###

# The build process is as follows (targets):

Documentation/DocBook/networking.tmpl

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ 
!Enet/sunrpc/rpcb_clnt.c

!Enet/sunrpc/clnt.c

     </sect1>

     <sect1><title>WiMAX</title>

!Enet/wimax/op-msg.c

!Enet/wimax/op-reset.c

!Enet/wimax/op-rfkill.c

!Enet/wimax/stack.c

!Iinclude/net/wimax.h

!Iinclude/linux/wimax.h

     </sect1>

  </chapter>



  <chapter id="netdev">