Commit ae7f6711 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Merge reason: We want to queue up a dependent patch. Also update to
              later -rc's.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 64abebf7 b23ff0e9

Documentation/feature-removal-schedule.txt

+49 −0
Original line number Diff line number Diff line
@@ -493,3 +493,52 @@ Why: These two features use non-standard interfaces. There are the 
Who:	Corentin Chary <corentin.chary@gmail.com>



----------------------------



What:	usbvideo quickcam_messenger driver

When:	2.6.35

Files:	drivers/media/video/usbvideo/quickcam_messenger.[ch]

Why:	obsolete v4l1 driver replaced by gspca_stv06xx

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	ov511 v4l1 driver

When:	2.6.35

Files:	drivers/media/video/ov511.[ch]

Why:	obsolete v4l1 driver replaced by gspca_ov519

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	w9968cf v4l1 driver

When:	2.6.35

Files:	drivers/media/video/w9968cf*.[ch]

Why:	obsolete v4l1 driver replaced by gspca_ov519

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	ovcamchip sensor framework

When:	2.6.35

Files:	drivers/media/video/ovcamchip/*

Why:	Only used by obsoleted v4l1 drivers

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	stv680 v4l1 driver

When:	2.6.35

Files:	drivers/media/video/stv680.[ch]

Why:	obsolete v4l1 driver replaced by gspca_stv0680

Who:	Hans de Goede <hdegoede@redhat.com>



----------------------------



What:	zc0301 v4l driver

When:	2.6.35

Files:	drivers/media/video/zc0301/*

Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only

	supports 2 USB-ID's (because it only supports a limited set of

	sensors) wich are also supported by the gspca_zc3xx driver

	(which supports 53 USB-ID's in total)

Who:	Hans de Goede <hdegoede@redhat.com>

MAINTAINERS

+8 −10
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c 


ALPHA PORT

M:	Richard Henderson <rth@twiddle.net>

S:	Odd Fixes for 2.4; Maintained for 2.6.

M:	Ivan Kokshaysky <ink@jurassic.park.msu.ru>

S:	Maintained for 2.4; PCI support for 2.6.

M:	Matt Turner <mattst88@gmail.com>

L:	linux-alpha@vger.kernel.org

F:	arch/alpha/
@@ -988,7 +987,6 @@ F: drivers/platform/x86/asus-laptop.c 


ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API

M:	Dan Williams <dan.j.williams@intel.com>

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

W:	http://sourceforge.net/projects/xscaleiop

S:	Supported

F:	Documentation/crypto/async-tx-api.txt
@@ -1638,9 +1636,8 @@ S: Maintained 
F:	sound/pci/cs5535audio/



CX18 VIDEO4LINUX DRIVER

M:	Hans Verkuil <hverkuil@xs4all.nl>

M:	Andy Walls <awalls@radix.net>

L:	ivtv-devel@ivtvdriver.org

L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://linuxtv.org
@@ -1825,7 +1822,6 @@ S: Supported 
F:	fs/dlm/



DMA GENERIC OFFLOAD ENGINE SUBSYSTEM

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

S:	Supported

F:	drivers/dma/
@@ -2788,7 +2784,7 @@ F: arch/x86/kernel/microcode_core.c 
F:	arch/x86/kernel/microcode_intel.c



INTEL I/OAT DMA DRIVER

M:	Maciej Sosnowski <maciej.sosnowski@intel.com>

M:	Dan Williams <dan.j.williams@intel.com>

S:	Supported

F:	drivers/dma/ioat*
@@ -2826,10 +2822,11 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ixp2000/



INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)

M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>

M:	Bruce Allan <bruce.w.allan@intel.com>

M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

L:	e1000-devel@lists.sourceforge.net
@@ -2839,6 +2836,7 @@ F: drivers/net/e100.c 
F:	drivers/net/e1000/

F:	drivers/net/e1000e/

F:	drivers/net/igb/

F:	drivers/net/igbvf/

F:	drivers/net/ixgb/

F:	drivers/net/ixgbe/
@@ -3012,8 +3010,8 @@ S: Maintained 
F:	drivers/isdn/hardware/eicon/



IVTV VIDEO4LINUX DRIVER

M:	Hans Verkuil <hverkuil@xs4all.nl>

L:	ivtv-devel@ivtvdriver.org

M:	Andy Walls <awalls@radix.net>

L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)

L:	linux-media@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git

W:	http://www.ivtvdriver.org

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 33

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*
@@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory 


# Avoid funny character set dependencies

unexport LC_ALL

LC_CTYPE=C

LC_COLLATE=C

LC_NUMERIC=C

export LC_CTYPE LC_COLLATE LC_NUMERIC

export LC_COLLATE LC_NUMERIC



# We are using a recursive build, so we need to do a little thinking

# to get the ordering right.

arch/alpha/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node) 
{

	int cpu;



	if (node == -1)

		return cpu_all_mask;



	cpumask_clear(&node_to_cpumask_map[node]);



	for_each_online_cpu(cpu) {

arch/arm/Kconfig

+35 −35
Original line number Diff line number Diff line
@@ -729,14 +729,26 @@ config ARCH_U8500 


endchoice



source "arch/arm/mach-aaec2000/Kconfig"



source "arch/arm/mach-at91/Kconfig"



source "arch/arm/mach-bcmring/Kconfig"



source "arch/arm/mach-clps711x/Kconfig"



source "arch/arm/mach-davinci/Kconfig"



source "arch/arm/mach-dove/Kconfig"



source "arch/arm/mach-ep93xx/Kconfig"



source "arch/arm/mach-footbridge/Kconfig"



source "arch/arm/mach-gemini/Kconfig"



source "arch/arm/mach-h720x/Kconfig"



source "arch/arm/mach-integrator/Kconfig"



source "arch/arm/mach-iop32x/Kconfig"
@@ -751,16 +763,26 @@ source "arch/arm/mach-ixp2000/Kconfig" 


source "arch/arm/mach-ixp23xx/Kconfig"



source "arch/arm/mach-kirkwood/Kconfig"



source "arch/arm/mach-ks8695/Kconfig"



source "arch/arm/mach-lh7a40x/Kconfig"



source "arch/arm/mach-loki/Kconfig"



source "arch/arm/mach-msm/Kconfig"



source "arch/arm/mach-mv78xx0/Kconfig"



source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"

source "arch/arm/plat-mxc/Kconfig"



source "arch/arm/mach-mmp/Kconfig"

source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-sa1100/Kconfig"

source "arch/arm/mach-nomadik/Kconfig"

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/mach-ns9xxx/Kconfig"



source "arch/arm/plat-omap/Kconfig"
@@ -770,9 +792,14 @@ source "arch/arm/mach-omap2/Kconfig" 


source "arch/arm/mach-orion5x/Kconfig"



source "arch/arm/mach-kirkwood/Kconfig"

source "arch/arm/mach-pxa/Kconfig"

source "arch/arm/plat-pxa/Kconfig"



source "arch/arm/mach-dove/Kconfig"

source "arch/arm/mach-mmp/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-sa1100/Kconfig"



source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"
@@ -800,41 +827,14 @@ if ARCH_S5PC1XX 
source "arch/arm/mach-s5pc100/Kconfig"

endif



source "arch/arm/mach-lh7a40x/Kconfig"

source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-h720x/Kconfig"

source "arch/arm/mach-ux500/Kconfig"



source "arch/arm/mach-versatile/Kconfig"



source "arch/arm/mach-aaec2000/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-at91/Kconfig"



source "arch/arm/plat-mxc/Kconfig"



source "arch/arm/mach-nomadik/Kconfig"

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/mach-netx/Kconfig"



source "arch/arm/mach-ns9xxx/Kconfig"



source "arch/arm/mach-davinci/Kconfig"



source "arch/arm/mach-ks8695/Kconfig"



source "arch/arm/mach-msm/Kconfig"



source "arch/arm/mach-u300/Kconfig"



source "arch/arm/mach-w90x900/Kconfig"



source "arch/arm/mach-bcmring/Kconfig"



source "arch/arm/mach-ux500/Kconfig"



# Definitions to make life easier

config ARCH_ACORN

	bool