linux_dsm_epyc7002/arch/arm/plat-s5p
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
..
include/plat ARM: SAMSUNG: Move duplicate code for SPDIF ops 2011-07-21 02:10:04 +09:00
clock.c ARM: SAMSUNG: Move duplicate code for SPDIF ops 2011-07-21 02:10:04 +09:00
cpu.c ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
dev-csis0.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-csis1.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-ehci.c ARM: EXYNOS4: Add usb host phy control 2011-04-13 16:50:44 -07:00
dev-fimc0.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc1.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc2.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc3.c ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
dev-onenand.c ARM: SAMSUNG: Remove unused onenand plat functions 2011-06-03 16:45:02 -07:00
dev-pmu.c ARM: S5P: Add PMU device 2010-08-05 18:30:21 +09:00
dev-uart.c ARM: S5P: Fix end address in memory resource information for UART devices 2011-02-17 12:53:36 +09:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq-gpioint.c genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) 2011-07-07 16:02:26 +00:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip 2011-05-09 10:12:39 +02:00
Kconfig Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable 2011-05-25 21:47:48 +01:00
Makefile ARM: S5P: Add usb ehci device 2011-04-13 16:50:44 -07:00
pm.c ARM: S5P: Remove unused s3c_pm_check_resume_pin 2011-04-14 13:19:40 +09:00
s5p-time.c clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0 2011-07-21 02:10:10 +09:00
setup-mipiphy.c ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
sysmmu.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00