H. Peter Anvin 68d00bbebb Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 ...

Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.

Resolved Conflicts:
	arch/x86/kernel/head32.c
	arch/x86/kernel/head64.c
	arch/x86/mm/init_64.c
	arch/x86/realmode/init.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2013-02-01 02:28:36 -08:00

..

alpha

ALPHA: drivers: remove __dev* attributes.

2013-01-03 15:57:13 -08:00

arm

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

2013-01-24 12:44:57 -08:00

arm64

arm64: elf: fix core dumping to match what glibc expects

2013-01-22 17:50:59 +00:00

avr32

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

blackfin

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

c6x

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

cris

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

frv

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

h8300

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

hexagon

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-12-20 18:05:28 -08:00

ia64

ia64: kill thread_matches(), unexport ptrace_check_attach()

2013-01-20 12:26:05 -08:00

m32r

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2013-01-23 13:31:15 -08:00

microblaze

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

2013-01-07 07:39:32 -08:00

mips

x86: Don't panic if can not alloc buffer for swiotlb

2013-01-29 19:36:53 -08:00

mn10300

arch/mn10300/Kconfig: select CONFIG_GENERIC_ATOMIC64

2013-01-11 14:54:55 -08:00

openrisc

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

parisc

parisc: sigaltstack doesn't round ss.ss_sp as required

2013-01-07 23:06:27 +01:00

powerpc

KVM: PPC: Emulate dcbf

2013-01-18 00:40:49 +01:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2013-01-17 08:56:30 -08:00

score

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

sh

sh: ecovec: add sample amixer settings

2013-01-16 18:30:44 +09:00

sparc

Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

2013-01-29 15:10:15 -08:00

tile

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-12-20 18:05:28 -08:00

unicore32

ARCH: drivers remove __dev* attributes.

2013-01-03 15:57:13 -08:00

x86

Merge remote-tracking branch 'origin/x86/mm' into x86/mm2

2013-02-01 02:28:36 -08:00

xtensa

These are a few cleanups for asm-generic:

2012-12-21 16:39:08 -08:00

.gitignore

…

Kconfig

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-12-20 18:05:28 -08:00