Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

2011-01-13 10:05:56 -08:00

..

amd64_edac_dbg.c

EDAC, MCE: Rework MCE injection

2010-10-21 14:47:59 +02:00

amd64_edac_inj.c

amd64_edac: Rework printk macros

2011-01-07 11:33:56 +01:00

amd64_edac.c

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

2011-01-07 14:54:03 -08:00

amd64_edac.h

EDAC: Fixup scrubrate manipulation

2011-01-07 11:38:31 +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

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

EDAC: Fixup scrubrate manipulation

2011-01-07 11:38:31 +01: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: Fixup scrubrate manipulation

2011-01-07 11:38:31 +01:00

edac_core.h

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13 10:05:56 -08: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: Fixup scrubrate manipulation

2011-01-07 11:38:31 +01:00

edac_mc.c

amd64_edac: Rework printk macros

2011-01-07 11:33:56 +01: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 typos in comments

2010-12-28 01:20:51 +01: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: Fixup scrubrate manipulation

2011-01-07 11:38:31 +01: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

amd64_edac: Remove explicit Kconfig PCI dependency

2011-01-07 11:33:58 +01:00

Makefile

EDAC: Remove deprecated kbuild goal definitions

2010-11-22 15:35:31 +01:00

mce_amd_inj.c

EDAC, MCE: Allow F15h bank 6 MCE injection

2011-01-07 11:54:23 +01:00

mce_amd.c

EDAC, MCE: Fix NB error formatting

2011-01-07 11:54:26 +01:00

mce_amd.h

EDAC, MCE: Overhaul error fields extraction macros

2011-01-07 11:54:21 +01: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

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04: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