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

Commit c4fc108a authored by Jody McIntyre's avatar Jody McIntyre
Browse files

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

parents 741854e4 e4f5c82a

Documentation/usb/error-codes.txt

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ USB-specific: 


-EMSGSIZE	(a) endpoint maxpacket size is zero; it is not usable

		    in the current interface altsetting.

		(b) ISO packet is biger than endpoint maxpacket

		(c) requested data transfer size is invalid (negative)

		(b) ISO packet is larger than the endpoint maxpacket.

		(c) requested data transfer length is invalid: negative

		    or too large for the host controller.



-ENOSPC		This request would overcommit the usb bandwidth reserved

		for periodic transfers (interrupt, isochronous).

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Maintained



BUSLOGIC SCSI DRIVER
@@ -833,6 +834,7 @@ P: LinuxTV.org Project 
M: 	linux-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Supported



EATA-DMA SCSI DRIVER
@@ -1634,6 +1636,15 @@ L: ldm-devel@lists.sourceforge.net 
W:	http://ldm.sourceforge.net

S:	Maintained



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

P:	Eric Moore

M:	Eric.Moore@lsil.com

M:	support@lsil.com

L:	mpt_linux_developer@lsil.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsilogic.com/support

S:	Supported



LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers

P:	Matthew Wilcox

M:	matthew@wil.cx
@@ -2885,6 +2896,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Maintained



W1 DALLAS'S 1-WIRE BUS

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc3

EXTRAVERSION =-rc5

NAME=Affluent Albatross



# *DOCUMENTATION*

arch/arm/configs/spitz_defconfig

+18 −1
Original line number Diff line number Diff line
@@ -897,7 +897,24 @@ CONFIG_UNIX98_PTYS=y 
#

# I2C support

#

# CONFIG_I2C is not set

CONFIG_I2C=y

# CONFIG_I2C_CHARDEV is not set



#

# I2C Algorithms

#

# CONFIG_I2C_ALGOBIT is not set

# CONFIG_I2C_ALGOPCF is not set

# CONFIG_I2C_ALGOPCA is not set



#

# I2C Hardware Bus support

#

CONFIG_I2C_PXA=y

# CONFIG_I2C_PXA_SLAVE is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set



#

# Hardware Monitoring support

arch/arm/mach-ixp4xx/ixdp425-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = { 
	{

		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,