android_kernel_xiaomi_sm8350/arch/arm/common
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
..
dmabounce.c ARM: dmabounce: get rid of dma_needs_bounce global function 2011-07-04 08:39:55 +01:00
gic.c ARM: GIC: avoid routing interrupts to offline CPUs 2011-07-21 15:04:17 +01:00
icst.c
it8152.c ARM: dmabounce: no need to check dev->bus type in needs_bounce function 2011-07-04 08:39:56 +01:00
Kconfig ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
locomo.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
Makefile ARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile. 2011-04-10 21:13:37 +01:00
pl330.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sa1111.c ARM: dmabounce: get rid of dma_needs_bounce global function 2011-07-04 08:39:55 +01:00
scoop.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
sharpsl_param.c
time-acorn.c
timer-sp.c clockevents: ARM sp804: obtain sp804 timer rate via clks 2011-05-23 18:04:53 +01:00
uengine.c
via82c505.c
vic.c ARM: Use struct syscore_ops instead of sysdevs for PM in common code 2011-04-24 19:16:08 +02:00