renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code
fbb078fcd2
linux-next/drivers/edac
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
amd64_edac_dbg.c EDAC, MCE: Rework MCE injection 2010-10-21 14:47:59 +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-10-21 14:04:58 -07:00
amd64_edac.h EDAC, MCE: Complete NB MCE decoders 2010-10-21 14:48:02 +02: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 edac, mc: Improve scrub rate handling 2010-08-03 16:14:06 +02:00
edac_core.h edac, mc: Improve scrub rate handling 2010-08-03 16:14:06 +02: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: core: remove completion-wait for complete with rcu_barrier 2009-09-24 07:21:05 -07:00
edac_mc_sysfs.c EDAC: Export edac sysfs class to users. 2010-10-21 14:47:59 +02:00
edac_mc.c amd64_edac: Fix driver module removal 2010-09-27 12:52:58 +02:00
edac_mce.c i7core_edac: Add edac_mce glue 2010-05-10 11:44:50 -03:00
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: core: remove completion-wait for complete with rcu_barrier 2009-09-24 07:21:05 -07:00
edac_stub.c EDAC: Export edac sysfs class to users. 2010-10-21 14:47:59 +02:00
i7core_edac.c i7core_edac: fix panic in udimm sysfs attributes registration 2010-10-01 10:50:58 -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: improve handling of pci_enable_device() return value 2010-08-11 08:59:21 -07:00
i5100_edac.c edac, mc: Improve scrub rate handling 2010-08-03 16:14:06 +02:00
i5400_edac.c edac: i5400: improve handling of pci_enable_device() return value 2010-08-11 08:59:21 -07:00
i7300_edac.c i7300_edac: Properly initialize per-csrow memory size 2010-09-24 14:16:12 -03:00
i82443bxgx_edac.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02: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 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac 2010-10-24 13:06:57 -07:00
Makefile Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac 2010-10-24 13:06:57 -07:00
mce_amd_inj.c EDAC, MCE: Rename files 2010-10-21 14:48:00 +02: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 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07: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/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -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