original_kernel/arch/sh/kernel
Linus Torvalds c32da02342 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
  doc: fix typo in comment explaining rb_tree usage
  Remove fs/ntfs/ChangeLog
  doc: fix console doc typo
  doc: cpuset: Update the cpuset flag file
  Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
  Remove drivers/parport/ChangeLog
  Remove drivers/char/ChangeLog
  doc: typo - Table 1-2 should refer to "status", not "statm"
  tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
  No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
  devres/irq: Fix devm_irq_match comment
  Remove reference to kthread_create_on_cpu
  tree-wide: Assorted spelling fixes
  tree-wide: fix 'lenght' typo in comments and code
  drm/kms: fix spelling in error message
  doc: capitalization and other minor fixes in pnp doc
  devres: typo fix s/dev/devm/
  Remove redundant trailing semicolons from macros
  fix typo "definetly" -> "definitely" in comment
  tree-wide: s/widht/width/g typo in comments
  ...

Fix trivial conflict in Documentation/laptops/00-INDEX
2010-03-12 16:04:50 -08:00
..
cpu
vsyscall
.gitignore
Makefile
asm-offsets.c
cpufreq.c
crash_dump.c
debugtraps.S
disassemble.c
dma-nommu.c
dumpstack.c
dwarf.c
entry-common.S
ftrace.c
head_32.S
head_64.S
hw_breakpoint.c
idle.c
init_task.c
io.c
io_generic.c
io_trapped.c
irq.c
irq_32.c
irq_64.c
kgdb.c
kprobes.c
localtimer.c
machine_kexec.c
machvec.c
module.c
nmi_debug.c
perf_callchain.c
perf_event.c
process.c
process_32.c
process_64.c
ptrace_32.c
ptrace_64.c
reboot.c
relocate_kernel.S
return_address.c
setup.c
sh_bios.c
sh_ksyms_32.c
sh_ksyms_64.c
signal_32.c
signal_64.c
smp.c
stacktrace.c
swsusp.c
sys_sh.c
sys_sh32.c
sys_sh64.c
syscalls_32.S
syscalls_64.S
time.c
topology.c
traps.c
traps_32.c
traps_64.c
unwinder.c
vmlinux.lds.S