linux/arch/h8300/kernel
Linus Torvalds d3ec4844d4 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: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
timer h8300: Switch do_timer() to xtime_update() 2011-01-31 14:55:45 +01:00
asm-offsets.c ptrace: remove PT_DTRACE from arch/h8300 2009-06-18 13:03:48 -07:00
entry.S h8300 entry.S update 2007-07-16 09:05:37 -07:00
gpio.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
h8300_ksyms.c Generic semaphore implementation 2008-04-17 10:42:34 -04:00
init_task.c Use new __init_task_data macro in arch init_task.c files. 2009-09-21 06:27:08 +02:00
irq.c h8300: Use generic show_interrupts() 2011-03-24 20:35:56 +01:00
Makefile h8300: update timer handler - misc update 2008-10-16 11:21:29 -07:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
process.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
ptrace.c ptrace: cleanup arch_ptrace() on h8300 2010-10-27 18:03:11 -07:00
setup.c treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
signal.c KEYS: Add missing linux/tracehook.h #inclusions 2009-09-09 18:30:02 +10:00
sys_h8300.c h8300: Fix missing consts in kernel_execve() 2010-09-07 13:52:28 -07:00
syscalls.S ns: Wire up the setns system call 2011-05-28 10:48:39 -07:00
time.c h8300: Switch do_timer() to xtime_update() 2011-01-31 14:55:45 +01:00
traps.c h8300: Fix die() 2010-09-07 13:52:28 -07:00
vmlinux.lds.S module: make MODULE_SYMBOL_PREFIX into a CONFIG option 2009-12-15 16:28:26 +10:30