Russell King 5ff7f78a3d Merge branch 'pxa-trizeps' into pxa-machines ...

Conflicts:

	drivers/pcmcia/Makefile

2008-10-07 19:06:52 +01:00

..

alpha

[PATCH] fix osf_getdirents()

2008-08-25 01:18:06 -04:00

arm

Merge branch 'pxa-trizeps' into pxa-machines

2008-10-07 19:06:52 +01:00

avr32

avr32: pm_standby low-power ram bug fix

2008-09-01 13:04:09 +02:00

blackfin

Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE

2008-08-28 17:32:01 +08:00

cris

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

frv

FRV: Wire up new system calls

2008-08-01 13:03:49 -07:00

h8300

[h8300] move include/asm-h8300 to arch/h8300/include/asm

2008-08-13 14:26:32 -07:00

ia64

lib: Correct printk %pF to work on all architectures

2008-09-09 11:51:15 -07:00

m32r

m32r: use generic show_mem()

2008-07-26 12:00:11 -07:00

m68k

m68k: atari_keyb_init operator precedence fix

2008-09-02 10:57:52 -07:00

m68knommu

m68k{,nommu}: Wire up new system calls

2008-08-11 10:37:34 -07:00

mips

[MIPS] IP22: Fix detection of second HPC3 on Challenge S

2008-09-08 18:45:39 +02:00

mn10300

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

parisc

lib: Correct printk %pF to work on all architectures

2008-09-09 11:51:15 -07:00

powerpc

lib: Correct printk %pF to work on all architectures

2008-09-09 11:51:15 -07:00

s390

[S390] CVE-2008-1514: prevent ptrace padding area read/write in 31-bit mode

2008-09-09 12:39:06 +02:00

sh

sh64: resume_kernel fix for kernel oops built with CONFIG_BKL_PREEMPT=y.

2008-09-05 14:51:28 +09:00

sparc

sparc: Fix resource flags for PCI children in OF device tree.

2008-08-28 22:59:10 -07:00

sparc64

sparc64: Disable timer interrupts in fixup_irqs().

2008-09-08 17:21:07 -07:00

um

uml: fix tty-related build error

2008-07-30 09:41:45 -07:00

x86

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2008-09-09 12:23:41 -07:00

xtensa

remove unneeded #include <linux/ide.h>'s

2008-08-05 18:17:00 +02:00

.gitignore

arch: Ignore arch/i386 and arch/x86_64

2008-01-19 21:29:39 -08:00

Kconfig

tracehook: CONFIG_HAVE_ARCH_TRACEHOOK

2008-07-26 12:00:09 -07:00