Greg Kroah-Hartman 6eafa4604c Merge 3.1-rc4 into staging-next ...

This resolves a conflict with:
	drivers/staging/brcm80211/brcmsmac/types.h

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2011-08-29 08:47:46 -07:00

..

alpha

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

arm

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2011-08-28 10:05:39 -07:00

avr32

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

blackfin

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

cris

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

frv

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

h8300

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

ia64

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

m32r

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

m68k

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

microblaze

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

mips

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

mn10300

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

openrisc

…

parisc

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

2011-08-04 06:36:20 -10:00

powerpc

arch/powerpc/sysdev/fsl_rio.c: correct IECSR register clear value

2011-08-25 18:51:06 -07:00

s390

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

score

…

sh

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

sparc

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

tile

Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2011-08-03 21:53:27 -10:00

um

ptrace: unify show_regs() prototype

2011-07-26 16:49:43 -07:00

unicore32

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

2011-07-29 23:35:05 -07:00

x86

Merge 3.1-rc4 into staging-next

2011-08-29 08:47:46 -07:00

xtensa

All Arch: remove linkage for sys_nfsservctl system call

2011-08-26 15:09:58 -07:00

.gitignore

…

Kconfig

Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG

2011-08-03 11:12:37 -04:00