Ingo Molnar a3eeeefbf1 Merge branch 'x86/tsc' into tracing/core ...

Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:

Conflicts:
	arch/x86/kernel/cpu/intel.c

2008-12-25 12:48:18 +01:00

..

alpha

alpha: pcibios_resource_to_bus() is callable from normal code

2008-11-30 10:03:37 -08:00

arm

[ARM] Ensure linux/hardirqs.h is included where required

2008-12-15 10:34:48 +00:00

avr32

Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2008-10-23 15:24:10 +02:00

blackfin

Blackfin arch: fix a broken define in dma-mapping

2008-11-18 17:48:22 +08:00

cris

[CRIS] Remove links from CRIS build

2008-10-31 23:37:57 +01:00

frv

frv: fix mmap2 error handling

2008-12-01 19:55:24 -08:00

h8300

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

2008-10-23 08:20:34 -07:00

ia64

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-12-15 16:30:22 -08:00

m32r

m32r: section noise in head.S

2008-11-30 10:03:37 -08:00

m68k

m68k: Update defconfigs for 2.6.28-rc7

2008-12-02 20:58:26 +01:00

m68knommu

container freezer: implement freezer cgroup subsystem

2008-10-20 08:52:34 -07:00

mips

MIPS: IP32: Update defconfig

2008-12-12 18:12:23 +00:00

mn10300

MN10300: Give correct size when reserving interrupt vector table

2008-12-10 13:34:33 -08:00

parisc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2008-11-30 14:04:31 -08:00

powerpc

Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into tracing/core

2008-12-19 09:42:40 +01:00

s390

Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

2008-12-02 15:56:17 -08:00

sh

sh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted platforms.

2008-12-16 16:42:53 +09:00

sparc

sparc: asm/bitops.h should define __fls

2008-12-03 16:04:52 -08:00

sparc64

sparc64: Sync FPU state in VIS emulation handler.

2008-12-04 09:12:57 -08:00

um

uml: boot broken due to buffer overrun

2008-12-10 08:01:52 -08:00

x86

Merge branch 'x86/tsc' into tracing/core

2008-12-25 12:48:18 +01:00

xtensa

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

2008-10-23 09:16:56 -07:00

.gitignore

…

Kconfig

remove __ARCH_WANT_COMPAT_SYS_PTRACE

2008-11-30 11:00:15 -08:00