Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
amd64_edac_dbg.c	EDAC, MCE: Rework MCE injection	2010-10-21 14:47:59 +02:00
amd64_edac_inj.c
amd64_edac.c	amd64_edac: Fix interleaving check	2010-12-08 19:52:54 +01:00
amd64_edac.h	EDAC, MCE: Complete NB MCE decoders	2010-10-21 14:48:02 +02:00
amd76x_edac.c
amd8111_edac.c
amd8111_edac.h
amd8131_edac.c
amd8131_edac.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
cell_edac.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
cpc925_edac.c
e7xxx_edac.c
e752x_edac.c
edac_core.h	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
edac_device_sysfs.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
edac_device.c
edac_mc_sysfs.c	Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core	2010-10-26 10:13:48 -07:00
edac_mc.c	EDAC: Fix workqueue-related crashes	2010-12-08 19:52:27 +01:00
edac_mce.c
edac_module.c	EDAC: Export edac sysfs class to users.	2010-10-21 14:47:59 +02:00
edac_module.h	EDAC: Export edac sysfs class to users.	2010-10-21 14:47:59 +02:00
edac_pci_sysfs.c	EDAC: Export edac sysfs class to users.	2010-10-21 14:47:59 +02:00
edac_pci.c
edac_stub.c	EDAC: Export edac sysfs class to users.	2010-10-21 14:47:59 +02:00
i7core_edac.c	i7core_edac: return -ENODEV when devices were already probed	2010-10-24 11:36:19 -02:00
i3000_edac.c
i3200_edac.c
i5000_edac.c
i5100_edac.c
i5400_edac.c
i7300_edac.c
i82443bxgx_edac.c
i82860_edac.c
i82875p_edac.c
i82975x_edac.c
Kconfig	Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac	2010-10-24 13:06:57 -07:00
Makefile	EDAC: Remove deprecated kbuild goal definitions	2010-11-22 15:35:31 +01:00
mce_amd_inj.c	EDAC, MCE: Fix edac_init_mce_inject error handling	2010-11-22 15:35:32 +01:00
mce_amd.c	EDAC, MCE: Fix shift warning on 32-bit	2010-10-21 14:48:07 +02:00
mce_amd.h	EDAC, MCE: Add a BIT_64() macro	2010-10-21 14:48:06 +02:00
mpc85xx_edac.c
mpc85xx_edac.h
mv64x60_edac.c
mv64x60_edac.h
pasemi_edac.c
ppc4xx_edac.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
ppc4xx_edac.h
r82600_edac.c
x38_edac.c