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

Commit 7e1548a5 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'omap3-upstream' of... 

Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
parents 1f7f569c 2619bc32

Documentation/local_ops.txt

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) 
	int cpu;



	/* Increment the counters */

	on_each_cpu(test_each, NULL, 0, 1);

	on_each_cpu(test_each, NULL, 1);

	/* Read all the counters */

	printk("Counters read from CPU %d\n", smp_processor_id());

	for_each_online_cpu(cpu) {

MAINTAINERS

+12 −2
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ ATM 
P:	Chas Williams

M:	chas@cmf.nrl.navy.mil

L:	linux-atm-general@lists.sourceforge.net (subscribers-only)

L:	netdev@vger.kernel.org

W:	http://linux-atm.sourceforge.net

S:	Maintained
@@ -3758,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx 
L:	sdhci-devel@list.drzeus.cx

S:	Maintained



SECURITY SUBSYSTEM

F:	security/

P:	James Morris

M:	jmorris@namei.org

L:	linux-kernel@vger.kernel.org

L:	linux-security-module@vger.kernel.org (suggested Cc:)

T:	git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git

S:	Supported



SECURITY CONTACT

P:	Security Officers

M:	security@kernel.org
@@ -4235,7 +4245,7 @@ M: dedekind@infradead.org 
P:	Adrian Hunter

M:	ext-adrian.hunter@nokia.com

L:	linux-mtd@lists.infradead.org

T:	git git://git.infradead.org/~dedekind/ubifs-2.6.git

T:	git git://git.infradead.org/ubifs-2.6.git

W:	http://www.linux-mtd.infradead.org/doc/ubifs.html

S:	Maintained
@@ -4289,7 +4299,7 @@ P: Artem Bityutskiy 
M:	dedekind@infradead.org

W:	http://www.linux-mtd.infradead.org/

L:	linux-mtd@lists.infradead.org

T:	git git://git.infradead.org/~dedekind/ubi-2.6.git

T:	git git://git.infradead.org/ubi-2.6.git

S:	Maintained



USB ACM DRIVER

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 28

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/arm/configs/omap3_pandora_defconfig

0 → 100644
+1409 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/omap_ldp_defconfig

+147 −1
Original line number Diff line number Diff line
@@ -316,7 +316,82 @@ CONFIG_BINFMT_MISC=y 
#

# CONFIG_PM is not set

CONFIG_ARCH_SUSPEND_POSSIBLE=y

# CONFIG_NET is not set

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

CONFIG_XFRM_USER=y

# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_XFRM_MIGRATE=y

# CONFIG_XFRM_STATISTICS is not set

CONFIG_NET_KEY=y

CONFIG_NET_KEY_MIGRATE=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_IP_MROUTE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_XFRM_MODE_BEET=y

# CONFIG_INET_LRO is not set

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# CONFIG_IPV6 is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set

# CONFIG_IP_DCCP is not set

# CONFIG_IP_SCTP is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_CAN is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

# CONFIG_WIRELESS is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# Device Drivers
@@ -332,6 +407,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
# CONFIG_DEBUG_DRIVER is not set

# CONFIG_DEBUG_DEVRES is not set

# CONFIG_SYS_HYPERVISOR is not set

CONFIG_CONNECTOR=y

CONFIG_PROC_EVENTS=y

# CONFIG_MTD is not set

# CONFIG_PARPORT is not set

CONFIG_BLK_DEV=y
@@ -390,6 +467,54 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_DH is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

# CONFIG_DM9000 is not set

# CONFIG_ENC28J60 is not set

CONFIG_SMC911X=y

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y



#

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# USB Network Adapters

#

# CONFIG_USB_CATC is not set

# CONFIG_USB_KAWETH is not set

# CONFIG_USB_PEGASUS is not set

# CONFIG_USB_RTL8150 is not set

# CONFIG_USB_USBNET is not set

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set



#

# Input device support
@@ -816,6 +941,27 @@ CONFIG_TMPFS=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

# CONFIG_NFSD is not set

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_NFS_ACL_SUPPORT=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set



#

# Partition Types