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

Commit 6206aa8b authored by Lachlan McIlroy's avatar Lachlan McIlroy
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 95f8e302 9e42d0cf

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Christoph Hellwig <hch@lst.de> 
Corey Minyard <minyard@acm.org>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

CREDITS

+22 −5
Original line number Diff line number Diff line
@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97 
D: sun4 port, Sparc hacker



N: Hugh Blemings

E: hugh@misc.nu

W: http://misc.nu/hugh/

D: Author and maintainer of the Keyspan USB to Serial drivers

S: Po Box 234

E: hugh@blemings.org

W: http://blemings.org/hugh

D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker

S: PO Box 234

S: Belconnen ACT 2616

S: Australia
@@ -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

Documentation/ABI/testing/sysfs-class-uwb_rc

+8 −6
Original line number Diff line number Diff line
@@ -32,14 +32,16 @@ Contact: linux-usb@vger.kernel.org 
Description:

                Write:



                <channel> [<bpst offset>]

                <channel>



                to start beaconing on a specific channel, or stop

                beaconing if <channel> is -1.  Valid channels depends

                on the radio controller's supported band groups.

                to force a specific channel to be used when beaconing,

                or, if <channel> is -1, to prohibit beaconing.  If

                <channel> is 0, then the default channel selection

                algorithm will be used.  Valid channels depends on the

                radio controller's supported band groups.



                <bpst offset> may be used to try and join a specific

                beacon group if more than one was found during a scan.

                Reading returns the currently active channel, or -1 if

                the radio controller is not beaconing.



What:           /sys/class/uwb_rc/uwbN/scan

Date:           July 2008

Documentation/ABI/testing/sysfs-devices-memory

+50 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ Description: 
		internal state of the kernel memory blocks. Files could be

		added or removed dynamically to represent hot-add/remove

		operations.



Users:		hotplug memory add/remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/
@@ -19,6 +18,56 @@ Description: 
		This is useful for a user-level agent to determine

		identify removable sections of the memory before attempting

		potentially expensive hot-remove memory operation

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/



What:		/sys/devices/system/memory/memoryX/phys_device

Date:		September 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/phys_device

		is read-only and is designed to show the name of physical

		memory device.  Implementation is currently incomplete.



What:		/sys/devices/system/memory/memoryX/phys_index

Date:		September 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/phys_index

		is read-only and contains the section ID in hexadecimal

		which is equivalent to decimal X contained in the

		memory section directory name.



What:		/sys/devices/system/memory/memoryX/state

Date:		September 2008

Contact:	Badari Pulavarty <pbadari@us.ibm.com>

Description:

		The file /sys/devices/system/memory/memoryX/state

		is read-write.  When read, it's contents show the

		online/offline state of the memory section.  When written,

		root can toggle the the online/offline state of a removable

		memory section (see removable file description above)

		using the following commands.

		# echo online > /sys/devices/system/memory/memoryX/state

		# echo offline > /sys/devices/system/memory/memoryX/state



		For example, if /sys/devices/system/memory/memory22/removable

		contains a value of 1 and

		/sys/devices/system/memory/memory22/state contains the

		string "online" the following command can be executed by

		by root to offline that section.

		# echo offline > /sys/devices/system/memory/memory22/state

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/



What:		/sys/devices/system/node/nodeX/memoryY

Date:		September 2008

Contact:	Gary Hade <garyhade@us.ibm.com>

Description:

		When CONFIG_NUMA is enabled

		/sys/devices/system/node/nodeX/memoryY is a symbolic link that

		points to the corresponding /sys/devices/system/memory/memoryY

		memory section directory.  For example, the following symbolic

		link is created for memory section 9 on node0.

		/sys/devices/system/node/node0/memory9 -> ../../memory/memory9

Documentation/DMA-mapping.txt

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ mapped only for the time they are actually used and unmapped after the DMA 
transfer.



The following API will work of course even on platforms where no such

hardware exists, see e.g. include/asm-i386/pci.h for how it is implemented on

hardware exists, see e.g. arch/x86/include/asm/pci.h for how it is implemented on

top of the virt_to_bus interface.



First of all, you should make sure