David S. Miller bb803cfbec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/scsi/fcoe/fcoe.c		2009-05-18 21:08:20 -07:00
..
cpufreq.c	powerpc: Fix cpufreq drivers after cpufreq core changes	2009-01-11 21:32:01 -08:00
dma_lib.c	powerpc/pasemi: Use DEFINE_SPINLOCK	2009-01-08 16:25:11 +11:00
gpio_mdio.c	net: Rework pasemi_mac driver to use of_mdio infrastructure	2009-04-27 02:53:49 -07:00
idle.c	[POWERPC] pasemi: Use machine_*_initcall() hooks in platform code	2008-01-02 14:08:42 -06:00
iommu.c	powerpc/pseries: iommu enablement for CMO	2008-07-25 15:44:43 +10:00
Kconfig	powerpc/kconfig: Kill PPC_MULTIPLATFORM	2009-03-11 17:11:35 +11:00
Makefile	[POWERPC] pasemi: Register i2c devices at boot	2008-02-21 21:08:35 +11:00
misc.c	i2c: Switch pasemi to the new device/driver matching scheme	2008-05-18 20:49:40 +02:00
pasemi.h	Merge branch 'linux-2.6'	2008-01-31 11:25:51 +11:00
pci.c	[POWERPC] pasemi: Add workaround for erratum 5945	2007-09-14 01:33:21 +10:00
powersave.S	[POWERPC] pasemi: Don't enter powersaving states from elevated astates	2007-12-01 13:03:40 -06:00
setup.c	powerpc/pasemi: Fix build error on UP	2009-04-22 14:56:35 +10:00
time.c	Remove all inclusions of <linux/config.h>	2006-10-04 03:38:54 -04:00