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

Commit 5e305895 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
parents ac178ef0 d2f8d7ee

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz> 
Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
@@ -100,6 +101,7 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Documentation/connector/cn_test.c

+2 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data) 


		memcpy(m + 1, data, m->len);



		cn_netlink_send(m, 0, gfp_any());

		cn_netlink_send(m, 0, GFP_ATOMIC);

		kfree(m);

	}
@@ -160,10 +160,8 @@ static int cn_test_init(void) 
		goto err_out;

	}



	init_timer(&cn_test_timer);

	cn_test_timer.function = cn_test_timer_func;

	setup_timer(&cn_test_timer, cn_test_timer_func, 0);

	cn_test_timer.expires = jiffies + HZ;

	cn_test_timer.data = 0;

	add_timer(&cn_test_timer);



	return 0;

Documentation/cpu-freq/user-guide.txt

+0 −16
Original line number Diff line number Diff line
@@ -195,19 +195,3 @@ scaling_setspeed. By "echoing" a new frequency into this 
				you can change the speed of the CPU,

				but only within the limits of

				scaling_min_freq and scaling_max_freq.
 
				



3.2 Deprecated Interfaces

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



Depending on your kernel configuration, you might find the following 

cpufreq-related files:

/proc/cpufreq

/proc/sys/cpu/*/speed

/proc/sys/cpu/*/speed-min

/proc/sys/cpu/*/speed-max



These are files for deprecated interfaces to cpufreq, which offer far

less functionality. Because of this, these interfaces aren't described

here.

Documentation/filesystems/sysfs-pci.txt

+12 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ that support it. For example, a given bus might look like this: 
     |   |-- class

     |   |-- config

     |   |-- device

     |   |-- enable

     |   |-- irq

     |   |-- local_cpus

     |   |-- resource
@@ -32,6 +33,7 @@ files, each with their own function. 
       class		   PCI class (ascii, ro)

       config		   PCI config space (binary, rw)

       device		   PCI device (ascii, ro)

       enable	           Whether the device is enabled (ascii, rw)

       irq		   IRQ number (ascii, ro)

       local_cpus	   nearby CPU mask (cpumask, ro)

       resource		   PCI resource host addresses (ascii, ro)
@@ -57,10 +59,19 @@ used to do actual device programming from userspace. Note that some platforms 
don't support mmapping of certain resources, so be sure to check the return

value from any attempted mmap.



The 'enable' file provides a counter that indicates how many times the device 

has been enabled.  If the 'enable' file currently returns '4', and a '1' is

echoed into it, it will then return '5'.  Echoing a '0' into it will decrease

the count.  Even when it returns to 0, though, some of the initialisation

may not be reversed.  



The 'rom' file is special in that it provides read-only access to the device's

ROM file, if available.  It's disabled by default, however, so applications

should write the string "1" to the file to enable it before attempting a read

call, and disable it following the access by writing "0" to the file.

call, and disable it following the access by writing "0" to the file.  Note

that the device must be enabled for a rom read to return data succesfully.

In the event a driver is not bound to the device, it can be enabled using the

'enable' file, documented above.



Accessing legacy resources through sysfs

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

Documentation/kernel-doc-nano-HOWTO.txt

+4 −3
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ Only comments so marked will be considered by the kernel-doc scripts, 
and any comment so marked must be in kernel-doc format.  Do not use

"/**" to be begin a comment block unless the comment block contains

kernel-doc formatted comments.  The closing comment marker for

kernel-doc comments can be either "*/" or "**/".

kernel-doc comments can be either "*/" or "**/", but "*/" is

preferred in the Linux kernel tree.



Kernel-doc comments should be placed just before the function

or data structure being described.
@@ -63,7 +64,7 @@ Example kernel-doc function comment: 
 * comment lines.

 *

 * The longer description can have multiple paragraphs.

 **/

 */



The first line, with the short description, must be on a single line.
@@ -85,7 +86,7 @@ Example kernel-doc data structure comment. 
 *		perhaps with more lines and words.

 *

 * Longer description of this structure.

 **/

 */



The kernel-doc function comments describe each parameter to the

function, in order, with the @name lines.