tmp_suning_uos_patched/arch/xtensa
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
..
boot xtensa: change to new flag variable 2011-03-17 14:02:57 +01:00
configs xtensa: remove obsolete BKL kernel option from defconfig 2011-04-11 14:56:22 +02:00
include/asm treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
kernel modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
lib xtensa: move headers files to arch/xtensa/include 2008-11-06 10:25:09 -08:00
mm mm: now that all old mmu_gather code is gone, remove the storage 2011-05-25 08:39:16 -07:00
platforms xtensa: Convert genirq namespace 2011-03-24 20:35:58 +01:00
variants XTENSA: static should be at beginning of declaration 2011-07-11 14:13:47 +02:00
Kconfig xtensa: Use generic config PREEMPT definition 2011-07-05 18:01:16 +02:00
Kconfig.debug [PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1 2005-06-24 00:05:21 -07:00
Makefile xtensa: Add -mforce-no-pic option is supported 2010-05-02 01:00:22 -07:00