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

Commit 4ef679e6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes'

parents 98ac62de 9a405257

MAINTAINERS

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

M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

W:	http://linuxtv.org

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

S:	Maintained

S:	Maintained





BUSLOGIC SCSI DRIVER

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

M: 	linux-dvb-maintainer@linuxtv.org

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

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

W:	http://linuxtv.org/

W:	http://linuxtv.org/

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

S:	Supported

S:	Supported





EATA-DMA SCSI DRIVER

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

W:	http://ldm.sourceforge.net

S:	Maintained

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

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

P:	Matthew Wilcox

P:	Matthew Wilcox

M:	matthew@wil.cx

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

M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

W:	http://linuxtv.org

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

S:	Maintained

S:	Maintained





W1 DALLAS'S 1-WIRE BUS

W1 DALLAS'S 1-WIRE BUS

arch/arm/configs/spitz_defconfig

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

#

# I2C support

# 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

# Hardware Monitoring support

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

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

	{

		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.regshift	= 2,

arch/arm/mach-pxa/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,8 @@ config MACH_AKITA 
	depends PXA_SHARPSL_27x

	depends PXA_SHARPSL_27x

	select PXA_SHARP_Cxx00

	select PXA_SHARP_Cxx00

	select MACH_SPITZ

	select MACH_SPITZ

	select I2C

	select I2C_PXA





config MACH_SPITZ

config MACH_SPITZ

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

	bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"

arch/arm/mm/flush.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -155,14 +155,19 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p 
 *  space mappings, we can be lazy and remember that we may have dirty

 *  space mappings, we can be lazy and remember that we may have dirty

 *  kernel cache lines for later.  Otherwise, we assume we have

 *  kernel cache lines for later.  Otherwise, we assume we have

 *  aliasing mappings.

 *  aliasing mappings.

 *

 * Note that we disable the lazy flush for SMP.

 */

 */

void flush_dcache_page(struct page *page)

void flush_dcache_page(struct page *page)

{

{

	struct address_space *mapping = page_mapping(page);

	struct address_space *mapping = page_mapping(page);





#ifndef CONFIG_SMP

	if (mapping && !mapping_mapped(mapping))

	if (mapping && !mapping_mapped(mapping))

		set_bit(PG_dcache_dirty, &page->flags);

		set_bit(PG_dcache_dirty, &page->flags);

	else {

	else

#endif

	{

		__flush_dcache_page(mapping, page);

		__flush_dcache_page(mapping, page);

		if (mapping && cache_is_vivt())

		if (mapping && cache_is_vivt())

			__flush_dcache_aliases(mapping, page);

			__flush_dcache_aliases(mapping, page);