Commit acf46481 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge' into powerpc-next

parents 80d267f9 8962cadb
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -54,6 +54,5 @@ series
cscope.*

*.orig
*.rej
*~
\#*#
+1 −2
Original line number Diff line number Diff line
@@ -96,5 +96,4 @@ missing-syscalls: scripts/checksyscalls.sh FORCE
	$(call cmd,syscalls)

# Delete all targets during make clean
clean-files := $(addprefix $(objtree)/,$(targets))
clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
+78 −55
Original line number Diff line number Diff line
@@ -982,13 +982,6 @@ L: bonding-devel@lists.sourceforge.net
W:	http://sourceforge.net/projects/bonding/
S:	Supported

BROADBAND PROCESSOR ARCHITECTURE
P:	Arnd Bergmann
M:	arnd@arndb.de
L:	linuxppc-dev@ozlabs.org
W:	http://www.penguinppc.org/ppc64/
S:	Supported

BROADCOM B44 10/100 ETHERNET DRIVER
P:	Gary Zambrano
M:	zambrano@broadcom.com
@@ -1052,6 +1045,14 @@ L: linux-kernel@vger.kernel.org
L:	discuss@x86-64.org
S:	Maintained

CELL BROADBAND ENGINE ARCHITECTURE
P:	Arnd Bergmann
M:	arnd@arndb.de
L:	linuxppc-dev@ozlabs.org
L:	cbe-oss-dev@ozlabs.org
W:	http://www.ibm.com/developerworks/power/cell/
S:	Supported

CFAG12864B LCD DRIVER
P:	Miguel Ojeda Sandonis
M:	maxextreme@gmail.com
@@ -1645,8 +1646,10 @@ W: http://linux-fbdev.sourceforge.net/
S:	Maintained

FREESCALE DMA DRIVER
P;	Zhang Wei
M:	wei.zhang@freescale.com
P:	Li Yang
M:	leoli@freescale.com
P:	Zhang Wei
M:	zw@zh-kernel.org
L:	linuxppc-embedded@ozlabs.org
L:	linux-kernel@vger.kernel.org
S:	Maintained
@@ -1940,8 +1943,10 @@ L: lm-sensors@lm-sensors.org
S:	Maintained

I2C SUBSYSTEM
P:	Jean Delvare
P:	Jean Delvare (PC drivers, core)
M:	khali@linux-fr.org
P:	Ben Dooks (embedded platforms)
M:	ben-linux@fluff.org
L:	i2c@lm-sensors.org
T:	quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/
S:	Maintained
@@ -2327,7 +2332,8 @@ S: Maintained
KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
P:	Sam Ravnborg
M:	sam@ravnborg.org
T:	git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
T:	git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git
T:	git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
L:	linux-kbuild@vger.kernel.org
S:	Maintained

@@ -2349,15 +2355,15 @@ S: Supported
KERNEL VIRTUAL MACHINE (KVM)
P:	Avi Kivity
M:	avi@qumranet.com
L:	kvm-devel@lists.sourceforge.net
W:	kvm.sourceforge.net
L:	kvm@vger.kernel.org
W:	http://kvm.qumranet.com
S:	Supported

KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
P:	Hollis Blanchard
M:	hollisb@us.ibm.com
L:	kvm-ppc-devel@lists.sourceforge.net
W:	kvm.sourceforge.net
L:	kvm-ppc@vger.kernel.org
W:	http://kvm.qumranet.com
S:	Supported

KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)
@@ -2365,8 +2371,8 @@ P: Anthony Xu
M:	anthony.xu@intel.com
P:	Xiantao Zhang
M:	xiantao.zhang@intel.com
L:	kvm-ia64-devel@lists.sourceforge.net
W:	kvm.sourceforge.net
L:	kvm-ia64@vger.kernel.org
W:	http://kvm.qumranet.com
S:	Supported

KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
@@ -2817,6 +2823,15 @@ M: jirislaby@gmail.com
L:	linux-kernel@vger.kernel.org
S:	Maintained

MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
P:	Andrew Gallatin
M:	gallatin@myri.com
P:	Brice Goglin
M:	brice@myri.com
L:	netdev@vger.kernel.org
W:	http://www.myri.com/scs/download-Myri10GE.html
S:	Supported

NATSEMI ETHERNET DRIVER (DP8381x)
P: 	Tim Hockin
M:	thockin@hockin.org
@@ -3130,7 +3145,7 @@ PCI ERROR RECOVERY
P:	Linas Vepstas
M:	linas@austin.ibm.com
L:	linux-kernel@vger.kernel.org
L:	linux-pci@atrey.karlin.mff.cuni.cz
L:	linux-pci@vger.kernel.org
S:	Supported

PCI SUBSYSTEM
@@ -3764,6 +3779,14 @@ M: dbrownell@users.sourceforge.net
L:	spi-devel-general@lists.sourceforge.net
S:	Maintained

SPU FILE SYSTEM
P:	Jeremy Kerr
M:	jk@ozlabs.org
L:	linuxppc-dev@ozlabs.org
L:	cbe-oss-dev@ozlabs.org
W:	http://www.ibm.com/developerworks/power/cell/
S:	Supported

STABLE BRANCH:
P:	Greg Kroah-Hartman
M:	greg@kroah.com
@@ -4019,12 +4042,41 @@ M: ballabio_dario@emc.com
L:	linux-scsi@vger.kernel.org
S:	Maintained

UCLINUX (AND M68KNOMMU)
P:	Greg Ungerer
M:	gerg@uclinux.org
W:	http://www.uclinux.org/
L:	uclinux-dev@uclinux.org  (subscribers-only)
S:	Maintained

UCLINUX FOR NEC V850
P:	Miles Bader

UCLINUX FOR RENESAS H8/300
P:	Yoshinori Sato
M:	ysato@users.sourceforge.jp
W:	http://uclinux-h8.sourceforge.jp/
S:	Supported

UDF FILESYSTEM
P:	Jan Kara
M:	jack@suse.cz
W:	http://linux-udf.sourceforge.net
S:	Maintained

UFS FILESYSTEM
P:	Evgeniy Dushistov
M:	dushistov@mail.ru
L:	linux-kernel@vger.kernel.org
S:	Maintained

UltraSPARC (sparc64):
P:	David S. Miller
M:	davem@davemloft.net
L:	sparclinux@vger.kernel.org
T:	git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
S:	Maintained

UNIFORM CDROM DRIVER
P:	Jens Axboe
M:	axboe@kernel.dk
@@ -4071,6 +4123,13 @@ L: netdev@vger.kernel.org
W:	http://www.linux-usb.org/usbnet
S:	Maintained

USB DIAMOND RIO500 DRIVER
P:	Cesar Miquel
M:	miquel@df.uba.ar
L:	rio500-users@lists.sourceforge.net
W:	http://rio500.sourceforge.net
S:	Maintained

USB EHCI DRIVER
P:	David Brownell
M:	dbrownell@users.sourceforge.net
@@ -4325,42 +4384,6 @@ M: romieu@fr.zoreil.com
L:	netdev@vger.kernel.org
S:	Maintained

UCLINUX (AND M68KNOMMU)
P:	Greg Ungerer
M:	gerg@uclinux.org
W:	http://www.uclinux.org/
L:	uclinux-dev@uclinux.org  (subscribers-only)
S:	Maintained

UCLINUX FOR NEC V850
P:	Miles Bader

UCLINUX FOR RENESAS H8/300
P:	Yoshinori Sato
M:	ysato@users.sourceforge.jp
W:	http://uclinux-h8.sourceforge.jp/
S:	Supported

UFS FILESYSTEM
P:	Evgeniy Dushistov
M:	dushistov@mail.ru
L:	linux-kernel@vger.kernel.org
S:	Maintained

UltraSPARC (sparc64):
P:	David S. Miller
M:	davem@davemloft.net
L:	sparclinux@vger.kernel.org
T:	git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
S:	Maintained

USB DIAMOND RIO500 DRIVER
P:	Cesar Miquel
M:	miquel@df.uba.ar
L:	rio500-users@lists.sourceforge.net
W:	http://rio500.sourceforge.net
S:	Maintained

VIDEO FOR LINUX
P:	Mauro Carvalho Chehab
M:	mchehab@infradead.org
+3 −2
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 26
EXTRAVERSION = -rc2
EXTRAVERSION = -rc3
NAME = Funky Weasel is Jiggy wit it

# *DOCUMENTATION*
@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                  include/linux/autoconf.h include/linux/version.h      \
                  include/linux/utsrelease.h                            \
                  include/linux/bounds.h include/asm*/asm-offsets.h     \
		  Module.symvers tags TAGS cscope*

# clean - Delete most, but leave enough to build external modules
@@ -1431,7 +1432,7 @@ define xtags
	elif $1 --version 2>&1 | grep -iq emacs; then \
	    $(all-sources) | xargs $1 -a; \
	    $(all-kconfigs) | xargs $1 -a \
		--regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
		--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \
	    $(all-defconfigs) | xargs -r $1 -a \
		--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
	else \
+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@


static struct fs_struct init_fs = INIT_FS;
static struct files_struct init_files = INIT_FILES;
static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
struct mm_struct init_mm = INIT_MM(init_mm);
Loading