Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 97103
b: refs/heads/master
c: 88dd0be
h: refs/heads/master
i:
  97101: dacb429
  97099: 949790d
  97095: 549f3d5
  97087: 6400b82
v: v3
  • Loading branch information
J. Bruce Fields committed May 18, 2008
1 parent 5c7794c commit ff56426
Show file tree
Hide file tree
Showing 498 changed files with 3,873 additions and 5,373 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e616c6303306df62223ebe2e68bb2f19c420dd81
refs/heads/master: 88dd0be3874566796fa4ffbdf927a53c4a6a2f4b
1 change: 1 addition & 0 deletions trunk/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@ series
cscope.*

*.orig
*.rej
*~
\#*#
3 changes: 2 additions & 1 deletion trunk/Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,5 @@ missing-syscalls: scripts/checksyscalls.sh FORCE
$(call cmd,syscalls)

# Delete all targets during make clean
clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
clean-files := $(addprefix $(objtree)/,$(targets))

129 changes: 54 additions & 75 deletions trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,13 @@ 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
Expand Down Expand Up @@ -1045,14 +1052,6 @@ 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
Expand Down Expand Up @@ -1646,10 +1645,8 @@ W: http://linux-fbdev.sourceforge.net/
S: Maintained

FREESCALE DMA DRIVER
P: Li Yang
M: leoli@freescale.com
P: Zhang Wei
M: zw@zh-kernel.org
P; Zhang Wei
M: wei.zhang@freescale.com
L: linuxppc-embedded@ozlabs.org
L: linux-kernel@vger.kernel.org
S: Maintained
Expand Down Expand Up @@ -2332,8 +2329,7 @@ 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-next.git
T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
L: linux-kbuild@vger.kernel.org
S: Maintained

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

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

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

KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
Expand Down Expand Up @@ -2823,15 +2819,6 @@ 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
Expand Down Expand Up @@ -3145,7 +3132,7 @@ PCI ERROR RECOVERY
P: Linas Vepstas
M: linas@austin.ibm.com
L: linux-kernel@vger.kernel.org
L: linux-pci@vger.kernel.org
L: linux-pci@atrey.karlin.mff.cuni.cz
S: Supported

PCI SUBSYSTEM
Expand Down Expand Up @@ -3779,14 +3766,6 @@ 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
Expand Down Expand Up @@ -4042,41 +4021,12 @@ 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
Expand Down Expand Up @@ -4123,13 +4073,6 @@ 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
Expand Down Expand Up @@ -4384,6 +4327,42 @@ 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
Expand Down
3 changes: 1 addition & 2 deletions trunk/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,6 @@ 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
Expand Down Expand Up @@ -1432,7 +1431,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_]+\)/\3/'; \
--regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
$(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/alpha/kernel/init_task.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@


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);
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/kernel/init_task.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <asm/pgtable.h>

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);
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/avr32/kernel/init_task.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <asm/pgtable.h>

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);
Expand Down
12 changes: 10 additions & 2 deletions trunk/arch/blackfin/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,16 @@ comment "Memory Setup"

comment "Misc"

config ENET_FLASH_PIN
int "PF port/pin used for flash and ethernet sharing"
depends on (BFIN533_STAMP)
default 0
help
PF port/pin used for flash and ethernet sharing to allow other PF
pins to be used on other platforms without having to touch common
code.
For example: PF0 --> 0,PF1 --> 1,PF2 --> 2, etc.

choice
prompt "Blackfin Exception Scratch Register"
default BFIN_SCRATCH_REG_RETN
Expand Down Expand Up @@ -685,8 +695,6 @@ choice
prompt "Uncached SDRAM region"
default DMA_UNCACHED_1M
depends on BFIN_DMA_5XX
config DMA_UNCACHED_4M
bool "Enable 4M DMA region"
config DMA_UNCACHED_2M
bool "Enable 2M DMA region"
config DMA_UNCACHED_1M
Expand Down
Loading

0 comments on commit ff56426

Please sign in to comment.