linux/arch/avr32/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
..
.gitignore avr32: add .gitignore files 2008-09-19 18:21:29 +02:00
Makefile Generic semaphore implementation 2008-04-17 10:42:34 -04:00
asm-offsets.c avr32: Fix lockup after Java stack underflow in user mode 2008-09-01 13:04:04 +02:00
avr32_ksyms.c asm-generic: rename generic little-endian bitops functions 2011-03-23 19:46:11 -07:00
cpu.c sysdev: Pass the attribute to the low level sysdev show/store function 2008-07-21 21:55:02 -07:00
entry-avr32b.S KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6] 2009-09-02 21:29:19 +10:00
head.S
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 avr32: Use generic show_interrupts() 2011-03-24 20:35:56 +01:00
kprobes.c [AVR32] Enable debugging only when needed 2008-01-25 08:31:39 +01:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
nmi_debug.c [AVR32] NMI debugging 2008-01-25 08:31:43 +01:00
ocd.c libfs: allow error return from simple attributes 2008-02-08 09:22:34 -08:00
process.c avr32: make architecture sys_clone prototype match asm-generic prototype 2011-01-13 20:41:06 +01:00
ptrace.c ptrace: cleanup arch_ptrace() on avr32 2010-10-27 18:03:10 -07:00
setup.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
signal.c KEYS: Add missing linux/tracehook.h #inclusions 2009-09-09 18:30:02 +10:00
stacktrace.c fix core/stacktrace changes on avr32, mips, sh 2008-07-18 14:42:35 +02:00
switch_to.S
sys_avr32.c Make do_execve() take a const filename pointer 2010-08-17 18:07:43 -07:00
syscall-stubs.S Unify sys_mmap* 2009-12-11 06:44:29 -05:00
syscall_table.S ns: Wire up the setns system call 2011-05-28 10:48:39 -07:00
time.c avr32: Convert to clocksource_register_hz 2011-01-13 20:41:11 +01:00
traps.c avr32: init cannot ignore signals sent by force_sig_info() 2011-04-13 15:46:55 +02:00
vmlinux.lds.S avr32: clean up linker script using standard macros. 2009-10-06 17:39:22 +02:00