git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Rusty Russell <rusty@rustcorp.com.au>
	Wed, 31 Dec 2008 12:35:57 +0000 (23:05 +1030)
committer	Rusty Russell <rusty@rustcorp.com.au>
	Wed, 31 Dec 2008 12:35:57 +0000 (23:05 +1030)
commit	2ca1a615835d9f4990f42102ab1f2ef434e7e89c
tree	726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059	tree \| snapshot (tar.gz zip)
parent	e12f0102ac81d660c9f801d0a0e10ccf4537a9de	commit \| diff
parent	6a94cb73064c952255336cc57731904174b2c58f	commit \| diff

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

Conflicts:

arch/x86/kernel/io_apic.c

29 files changed:

arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/localtimer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/of_device_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/pci_msi.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/smp_32.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/smp_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/sparc_ksyms_32.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/time_64.c	\|	diff2 \|	blob \| history
arch/x86/include/asm/pci.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/hpet.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/events.c	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/proc.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history

arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91rm9200_time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/localtimer.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-sa1100/time.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-versatile/core.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/of_device_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/pci_msi.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/smp_32.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/smp_64.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/sparc_ksyms_32.c	\|	diff2 \|	blob \| history
arch/sparc/kernel/time_64.c	\|	diff2 \|	blob \| history
arch/x86/include/asm/pci.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/hpet.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/io_apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq_64.c	diff1 \|	diff2 \|	blob \| history
drivers/xen/events.c	diff1 \|	diff2 \|	blob \| history
include/linux/interrupt.h	diff1 \|	diff2 \|	blob \| history
include/linux/irq.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/manage.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/proc.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history