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

Commit af15c1ad authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'master' into for-linus

parents e6f25a7b dcd94dbd

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ F: drivers/input/misc/ati_remote2.c 


ATLX ETHERNET DRIVERS

M:	Jay Cliburn <jcliburn@gmail.com>

M:	Chris Snook <csnook@redhat.com>

M:	Chris Snook <chris.snook@gmail.com>

M:	Jie Yang <jie.yang@atheros.com>

L:	atl1-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/atl1
@@ -3563,6 +3563,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git 
S:	Maintained

F:	net/

F:	include/net/

F:	include/linux/in.h

F:	include/linux/net.h

F:	include/linux/netdevice.h



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>
@@ -3598,6 +3601,8 @@ W: http://www.linuxfoundation.org/en/Net 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

S:	Odd Fixes

F:	drivers/net/

F:	include/linux/if_*

F:	include/linux/*device.h



NETXEN (1/10) GbE SUPPORT

M:	Dhananjay Phadke <dhananjay@netxen.com>

arch/arm/configs/rx51_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0"

CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0 console=ttyS2,115200n8"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set
@@ -1354,7 +1354,7 @@ CONFIG_USB_OTG_UTILS=y 
# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TWL4030_USB=y

CONFIG_MMC=m

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -1449,7 +1449,8 @@ CONFIG_RTC_DRV_TWL4030=m 
# on-CPU RTC drivers

#

# CONFIG_DMADEVICES is not set

# CONFIG_REGULATOR is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_TWL4030=y

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

arch/arm/include/asm/setup.h

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } 
struct membank {

	unsigned long start;

	unsigned long size;

	int           node;

	unsigned short node;

	unsigned short highmem;

};



struct meminfo {

arch/arm/mach-ixp4xx/include/mach/io.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


#include <mach/hardware.h>



#define IO_SPACE_LIMIT 0xffff0000

#define IO_SPACE_LIMIT 0x0000ffff



extern int (*ixp4xx_pci_read)(u32 addr, u32 cmd, u32* data);

extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);

arch/arm/mach-mx3/mx31moboard-devboard.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct imxuart_platform_data uart_pdata = { 


static int devboard_sdhc2_get_ro(struct device *dev)

{

	return gpio_get_value(SDHC2_WP);

	return !gpio_get_value(SDHC2_WP);

}



static int devboard_sdhc2_init(struct device *dev, irq_handler_t detect_irq,