1
linux/arch/sh/kernel/cpu
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
..
irq sh64: irq_data conversion. 2010-10-27 15:38:59 +09:00
sh2 sh: migrate SH_CLK_MD to mode pin API. 2010-11-09 16:40:00 +09:00
sh2a sh: Fix up SH7201 clkfwk build. 2010-12-24 12:15:57 +09:00
sh3 sh: Tidy CPU probing and fixup section annotations. 2010-04-21 12:01:06 +09:00
sh4 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
sh4a Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
sh5 sh: Tidy CPU probing and fixup section annotations. 2010-04-21 12:01:06 +09:00
shmobile suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
adc.c
clock-cpg.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
fpu.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
hwblk.c sh: hwblk index rework 2010-05-11 11:48:31 +09:00
init.c sh: Expose physical addressing mode through cpuinfo. 2010-10-26 14:44:58 +09:00
Makefile sh: Break out cpuinfo_op procfs bits. 2010-11-09 16:40:16 +09:00
proc.c sh: Break out cpuinfo_op procfs bits. 2010-11-09 16:40:16 +09:00