David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

2008-07-18 02:39:39 -07:00

..

alpha

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

arm

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

avr32

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

2008-07-16 15:17:52 -07:00

blackfin

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-18 02:39:39 -07:00

cris

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

frv

PCI: remove unused arch pcibios_update_resource() functions

2008-06-27 13:14:01 -07:00

h8300

[PATCH] take init_files to fs/file.c

2008-05-16 17:22:20 -04:00

ia64

fix build error of arch/ia64/kvm/*

2008-07-17 09:16:31 -07:00

m32r

smp_call_function: get rid of the unused nonatomic/retry argument

2008-06-26 11:24:35 +02:00

m68k

Merge commit 'v2.6.26' into bkl-removal

2008-07-14 15:29:34 -06:00

m68knommu

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

2008-07-16 17:25:46 -07:00

mips

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

2008-07-16 17:25:46 -07:00

mn10300

mn10300: provide __ucmpdi2() for MN10300

2008-07-04 10:40:07 -07:00

parisc

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

powerpc

powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET

2008-07-16 11:43:48 -07:00

s390

[S390] Fix stacktrace compile bug.

2008-07-17 17:22:09 +02:00

sh

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

2008-07-16 17:25:46 -07:00

sparc

Merge commit 'v2.6.26' into bkl-removal

2008-07-14 15:29:34 -06:00

sparc64

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

2008-07-16 17:25:46 -07:00

um

Merge branch 'generic-ipi' into generic-ipi-for-linus

2008-07-15 21:55:59 +02:00

v850

[PATCH] take init_files to fs/file.c

2008-05-16 17:22:20 -04:00

x86

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

2008-07-17 10:38:59 -07:00

xtensa

[PATCH] take init_files to fs/file.c

2008-05-16 17:22:20 -04:00

.gitignore

arch: Ignore arch/i386 and arch/x86_64

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

Kconfig

Add generic helpers for arch IPI function calls

2008-06-26 11:21:34 +02:00