android_kernel_xiaomi_sm8350/drivers/char/agp
Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-15 21:55:59 +02:00
..
agp.h drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
ali-agp.c
alpha-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
amd64-agp.c Merge branch 'linus' into x86/gart 2008-06-25 12:30:26 +02:00
amd-k7-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
ati-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
backend.c agp: two-stage page destruction issue 2008-06-19 09:56:16 +10:00
compat_ioctl.c agp: more boolean conversions. 2008-06-19 10:42:17 +10:00
compat_ioctl.h
efficeon-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
frontend.c Merge commit 'v2.6.26' into bkl-removal 2008-07-14 15:29:34 -06:00
generic.c on_each_cpu(): kill unused 'retry' parameter 2008-06-26 11:24:38 +02:00
hp-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
i460-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
intel-agp.c [agp]: fixup chipset flush for new Intel G4x. 2008-06-20 11:48:06 +10:00
isoch.c
Kconfig
Makefile
nvidia-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
parisc-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
sgi-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
sis-agp.c
sworks-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
uninorth-agp.c drivers/char/agp - use bool 2008-06-19 10:04:20 +10:00
via-agp.c agp/via: fixup pci ids 2008-06-19 09:52:26 +10:00