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

Commit b7476645 authored by Felix Blyakher's avatar Felix Blyakher
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 8e08f6eb 071a0bc2

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.

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ and is between 256 and 4096 characters. It is defined in the file 




	intel_iommu=	[DMAR] Intel IOMMU driver (DMAR) option

		on

			Enable intel iommu driver.

		off

			Disable intel iommu driver.

		igfx_off [Default Off]

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -1202,6 +1202,8 @@ S: Supported 
CONTROL GROUPS (CGROUPS)

P:	Paul Menage

M:	menage@google.com

P:	Li Zefan

M:	lizf@cn.fujitsu.com

L:	containers@lists.linux-foundation.org

S:	Maintained
@@ -3537,6 +3539,12 @@ S: Maintained 
PXA MMCI DRIVER

S:	Orphan



PXA RTC DRIVER

P:	Robert Jarzmik

M:	robert.jarzmik@free.fr

L:	rtc-linux@googlegroups.com

S:	Maintained



QLOGIC QLA2XXX FC-SCSI DRIVER

P:	Andrew Vasquez

M:	linux-driver@qlogic.com
@@ -4285,8 +4293,8 @@ P: Rajiv Andrade 
M:	srajiv@linux.vnet.ibm.com

W:	http://tpmdd.sourceforge.net

P:	Marcel Selhorst

M:	tpm@selhorst.net

W:	http://www.prosec.rub.de/tpm/

M:	m.selhorst@sirrix.com

W:	http://www.sirrix.com

L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)

S:	Maintained

arch/arm/kernel/machine_kexec.c

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <asm/cacheflush.h>

#include <asm/mach-types.h>



const extern unsigned char relocate_new_kernel[];

const extern unsigned int relocate_new_kernel_size;

extern const unsigned char relocate_new_kernel[];

extern const unsigned int relocate_new_kernel_size;



extern void setup_mm_for_reboot(char mode);

arch/arm/mach-pxa/dma.c

+10 −8
Original line number Diff line number Diff line
@@ -121,20 +121,22 @@ int __init pxa_init_dma(int num_ch) 
	if (dma_channels == NULL)

		return -ENOMEM;



	ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);

	if (ret) {

		printk (KERN_CRIT "Wow!  Can't register IRQ for DMA\n");

		kfree(dma_channels);

		return ret;

	}



	/* dma channel priorities on pxa2xx processors:

	 * ch 0 - 3,  16 - 19  <--> (0) DMA_PRIO_HIGH

	 * ch 4 - 7,  20 - 23  <--> (1) DMA_PRIO_MEDIUM

	 * ch 8 - 15, 24 - 31  <--> (2) DMA_PRIO_LOW

	 */

	for (i = 0; i < num_ch; i++)

	for (i = 0; i < num_ch; i++) {

		DCSR(i) = 0;

		dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW);

	}



	ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);

	if (ret) {

		printk (KERN_CRIT "Wow!  Can't register IRQ for DMA\n");

		kfree(dma_channels);

		return ret;

	}



	num_dma_channels = num_ch;

	return 0;