Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ...

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

2010-05-22 00:36:56 -06:00

..

amd64_edac_dbg.c

x86, mce: pass mce info to EDAC for decoding

2009-09-14 18:59:17 +02:00

amd64_edac_inj.c

amd64_edac: beef up DRAM error injection

2009-10-07 16:51:28 +02:00

amd64_edac.c

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

2010-03-03 09:25:37 -08:00

amd64_edac.h

amd64_edac: Simplify ECC override handling

2010-03-01 19:25:12 +01:00

amd76x_edac.c

PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments

2010-05-18 14:59:08 -07:00

amd8111_edac.c

edac: add edac_device_alloc_index()

2009-06-18 13:03:56 -07:00

amd8111_edac.h

edac: AMD8111 driver header file

2009-04-02 19:05:03 -07:00

amd8131_edac.c

edac: AMD8111 & AMD8131 use dev_name()

2009-05-29 08:40:03 -07:00

amd8131_edac.h

edac: AMD8131 driver header file

2009-04-02 19:05:03 -07:00

cell_edac.c

edac: add missing __devexit_p()

2009-06-18 13:03:57 -07:00

cpc925_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

e7xxx_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

e752x_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

edac_core.h

edac: add memory types strings for debugging

2009-12-07 19:14:31 +01:00

edac_device_sysfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

edac_device.c

edac: core: remove completion-wait for complete with rcu_barrier

2009-09-24 07:21:05 -07:00

edac_mc_sysfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

edac_mc.c

edac: add memory types strings for debugging

2009-12-07 19:14:31 +01:00

edac_mce_amd.c

edac, mce: Fix wrong mask and macro usage

2010-04-30 10:15:39 -07:00

edac_mce_amd.h

EDAC, AMD: carve out MCi_STATUS decoding

2009-09-14 19:01:07 +02:00

edac_module.c

Driver core: change sysdev classes to use dynamic kobject names

2008-01-24 20:40:40 -08:00

edac_module.h

edac: remove unneeded functions and add static accessor

2008-04-29 08:06:26 -07:00

edac_pci_sysfs.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

edac_pci.c

edac: core: remove completion-wait for complete with rcu_barrier

2009-09-24 07:21:05 -07:00

edac_stub.c

drivers/edac: code tidying on export-gpl

2007-07-19 10:04:57 -07:00

i3000_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i3200_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i5000_edac.c

edac: i5000_edac critical fix panic out of bounds

2010-01-16 12:15:38 -08:00

i5100_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i5400_edac.c

edac: i5400 fix csrow mapping

2009-10-29 07:39:30 -07:00

i82443bxgx_edac.c

PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments

2010-05-18 14:59:08 -07:00

i82860_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i82875p_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

i82975x_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

x86: EDAC: carve out AMD MCE decoding logic

2009-10-02 15:42:19 +02:00

Makefile

x86: EDAC: carve out AMD MCE decoding logic

2009-10-02 15:42:19 +02:00

mpc85xx_edac.c

of: Remove duplicate fields from of_platform_driver

2010-05-22 00:10:40 -06:00

mpc85xx_edac.h

edac: mpc85xx mask ecc syndrome correctly

2010-03-12 15:52:40 -08:00

mv64x60_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mv64x60_edac.h

drivers-edac: add marvell mv64x60 driver

2008-02-07 08:42:23 -08:00

pasemi_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ppc4xx_edac.c

of: Remove duplicate fields from of_platform_driver

2010-05-22 00:10:40 -06:00

ppc4xx_edac.h

edac: new ppc4xx driver module

2009-04-02 19:05:03 -07:00

r82600_edac.c

PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments

2010-05-18 14:59:08 -07:00

x38_edac.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00