Linus Torvalds 723e9db7a4 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits) powerpc/nvram: Enable use Generic NVRAM driver for different size chips powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline powerpc/ps3: Workaround for flash memory I/O error powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead powerpc/perf_counters: Reduce stack usage of power_check_constraints powerpc: Fix bug where perf_counters breaks oprofile powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops powerpc/irq: Improve nanodoc powerpc: Fix some late PowerMac G5 with PCIe ATI graphics powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT powerpc/book3e: Add missing page sizes powerpc/pseries: Fix to handle slb resize across migration powerpc/powermac: Thermal control turns system off too eagerly powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan() powerpc/405ex: support cuImage via included dtb powerpc/405ex: provide necessary fixup function to support cuImage powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support. powerpc/44x: Update Arches defconfig powerpc/44x: Update Arches dts ... Fix up conflicts in drivers/char/agp/uninorth-agp.c		2009-09-15 09:51:09 -07:00
..
agp.h	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
ali-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
alpha-agp.c
amd64-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
amd-k7-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
ati-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
backend.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
compat_ioctl.c
compat_ioctl.h
efficeon-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
frontend.c
generic.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
hp-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
i460-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
intel-agp.c	Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6	2009-09-15 09:18:07 -07:00
isoch.c
Kconfig
Makefile
nvidia-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
parisc-agp.c	Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next	2009-08-05 10:16:57 +10:00
sgi-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
sis-agp.c
sworks-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
uninorth-agp.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-09-15 09:51:09 -07:00
via-agp.c