Skip to content

Commit

Permalink
Merge commit 'v2.6.32-rc7' into perf/core
Browse files Browse the repository at this point in the history
Merge reason: pick up perf fixlets

Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Ingo Molnar committed Nov 15, 2009
2 parents 4c49b12 + 156171c commit 39dc78b
Show file tree
Hide file tree
Showing 382 changed files with 7,011 additions and 3,646 deletions.
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-piix4
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Supported adapters:
Datasheet: Only available via NDA from ServerWorks
* ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
Datasheet: Not publicly available
* AMD SB900
* AMD Hudson-2
Datasheet: Not publicly available
* Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
Datasheet: Publicly available at the SMSC website http://www.smsc.com
Expand Down
389 changes: 201 additions & 188 deletions Documentation/thermal/sysfs-api.txt

Large diffs are not rendered by default.

40 changes: 19 additions & 21 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ M: Ron Minnich <[email protected]>
M: Latchesar Ionkov <[email protected]>
L: [email protected]
W: http://swik.net/v9fs
T: git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
S: Maintained
F: Documentation/filesystems/9p.txt
F: fs/9p/
Expand Down Expand Up @@ -906,7 +906,6 @@ M: Karol Kozimor <[email protected]>
L: [email protected]
W: http://acpi4asus.sf.net
S: Maintained
F: arch/x86/kernel/acpi/boot.c
F: drivers/platform/x86/asus_acpi.c

ASUS ASB100 HARDWARE MONITOR DRIVER
Expand Down Expand Up @@ -1245,11 +1244,10 @@ S: Supported
F: drivers/net/tg3.*

BROCADE BFA FC SCSI DRIVER
P: Jing Huang
M: [email protected]
L: [email protected]
S: Supported
F: drivers/scsi/bfa/
M: Jing Huang <[email protected]>
L: [email protected]
S: Supported
F: drivers/scsi/bfa/

BSG (block layer generic sg v4 driver)
M: FUJITA Tomonori <[email protected]>
Expand Down Expand Up @@ -2825,7 +2823,7 @@ F: drivers/infiniband/hw/ipath/

IPMI SUBSYSTEM
M: Corey Minyard <[email protected]>
L: [email protected]
L: [email protected] (moderated for non-subscribers)
W: http://openipmi.sourceforge.net/
S: Supported
F: Documentation/IPMI.txt
Expand Down Expand Up @@ -3618,7 +3616,7 @@ L: [email protected]
L: [email protected]
W: http://www.netfilter.org/
W: http://www.iptables.org/
T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
S: Supported
F: include/linux/netfilter*
F: include/linux/netfilter/
Expand Down Expand Up @@ -3665,6 +3663,7 @@ L: [email protected]
W: http://www.linuxfoundation.org/en/Net
W: http://patchwork.ozlabs.org/project/netdev/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
S: Maintained
F: net/
F: include/net/
Expand Down Expand Up @@ -4636,7 +4635,7 @@ F: drivers/mmc/host/sdhci-s3c.c
SECURITY SUBSYSTEM
M: James Morris <[email protected]>
L: [email protected] (suggested Cc:)
T: git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
W: http://security.wiki.kernel.org/
S: Supported
F: security/
Expand Down Expand Up @@ -4672,12 +4671,11 @@ F: include/linux/ata.h
F: include/linux/libata.h

SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
P: Jayamohan Kallickal
M: [email protected]
L: [email protected]
W: http://www.serverengines.com
S: Supported
F: drivers/scsi/be2iscsi/
M: Jayamohan Kallickal <[email protected]>
L: [email protected]
W: http://www.serverengines.com
S: Supported
F: drivers/scsi/be2iscsi/

SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
M: Sathya Perla <[email protected]>
Expand Down Expand Up @@ -5683,11 +5681,11 @@ F: drivers/vlynq/vlynq.c
F: include/linux/vlynq.h

VMWARE VMXNET3 ETHERNET DRIVER
M: Shreyas Bhatewara <[email protected]>
M: VMware, Inc. <[email protected]>
L: [email protected]
S: Maintained
F: drivers/net/vmxnet3/
M: Shreyas Bhatewara <[email protected]>
M: "VMware, Inc." <[email protected]>
L: [email protected]
S: Maintained
F: drivers/net/vmxnet3/

VOLTAGE AND CURRENT REGULATOR FRAMEWORK
M: Liam Girdwood <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 32
EXTRAVERSION = -rc6
EXTRAVERSION = -rc7
NAME = Man-Eating Seals of Antiquity

# *DOCUMENTATION*
Expand Down
4 changes: 2 additions & 2 deletions arch/alpha/include/asm/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#define F_GETOWN 6 /* for sockets. */
#define F_SETSIG 10 /* for sockets. */
#define F_GETSIG 11 /* for sockets. */
#define F_SETOWN_EX 12
#define F_GETOWN_EX 13
#define F_SETOWN_EX 15
#define F_GETOWN_EX 16

/* for posix fcntl() and lockf() */
#define F_RDLCK 1
Expand Down
4 changes: 2 additions & 2 deletions arch/alpha/include/asm/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ struct thread_info {
register struct thread_info *__current_thread_info __asm__("$8");
#define current_thread_info() __current_thread_info

#endif /* __ASSEMBLY__ */

/* Thread information allocation. */
#define THREAD_SIZE_ORDER 1
#define THREAD_SIZE (2*PAGE_SIZE)

#endif /* __ASSEMBLY__ */

#define PREEMPT_ACTIVE 0x40000000

/*
Expand Down
24 changes: 17 additions & 7 deletions arch/arm/configs/ams_delta_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS is not set
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not set
CONFIG_HOTPLUG=y
Expand Down Expand Up @@ -224,7 +224,7 @@ CONFIG_CPU_CP15_MMU=y
#
# Processor Features
#
# CONFIG_ARM_THUMB is not set
CONFIG_ARM_THUMB=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
CONFIG_CPU_DCACHE_WRITETHROUGH=y
Expand All @@ -248,7 +248,7 @@ CONFIG_CPU_DCACHE_WRITETHROUGH=y
# CONFIG_HIGH_RES_TIMERS is not set
CONFIG_PREEMPT=y
CONFIG_HZ=100
# CONFIG_AEABI is not set
CONFIG_AEABI=y
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
Expand Down Expand Up @@ -299,7 +299,9 @@ CONFIG_BINFMT_ELF=y
#
# Power management options
#
# CONFIG_PM is not set
CONFIG_PM=y
# CONFIG_SUSPEND is not set
CONFIG_PM_RUNTIME=y

#
# Networking
Expand Down Expand Up @@ -670,7 +672,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_EVDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set

#
Expand Down Expand Up @@ -784,6 +786,7 @@ CONFIG_I2C_OMAP=y
#
# CONFIG_SPI is not set
# CONFIG_SPI_MASTER is not set
CONFIG_GPIO_SYSFS=y

#
# Dallas's 1-wire bus
Expand Down Expand Up @@ -820,6 +823,7 @@ CONFIG_LEDS_AMS_DELTA=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

#
# Multimedia devices
Expand Down Expand Up @@ -896,7 +900,13 @@ CONFIG_LOGO_LINUX_CLUT224=y
#
# Sound
#
# CONFIG_SOUND is not set
CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_AMS_DELTA=y

#
# HID Devices
Expand Down
Loading

0 comments on commit 39dc78b

Please sign in to comment.