openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-shmobile
History
Dave Airlie e8115e79aa Linux 3.18-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUe7l9AAoJEHm+PkMAQRiGkGcIAIryQ7NKn4IaxUtS807Lx4Ih
 obEnx7nNKZTXCZpD/7XQGHMMJyozMJR50PHZESJoHu4Luhv9h7EFRnyJ6MdqMlwn
 zla3zY0yRsHwPoJKcHbSE0CPHZz0WPQHj7IEbM+XJz2tMNJfbgTrezElmcCM4DRp
 c9ae+ggwZ2cyNYM0r2RSwSJ525WMh69f9dzSUE27fpvkllQgwqNs/jHYz8HNOEht
 FWcv5UhvzKjwJS3awULfOB3zH2QdFvVTrwAzd+kbV2Q6T6CaUoFRlhXeKUO6W2Jv
 pJM6oj8tMZUkdXEv7EQXT1kwEqC4DULTTTHs4tSF79O1ESmNfePiOwwBcwoM2nM=
 =kG1Y
 -----END PGP SIGNATURE-----

Merge tag 'v3.18-rc7' into drm-next

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c
 		2014-12-02 10:58:33 +10:00
..
include/mach Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
Kconfig ARM: SoC platform changes for 3.18 2014-10-08 17:13:04 -04:00
Makefile ARM: SoC platform changes for 3.18 2014-10-08 17:13:04 -04:00
Makefile.boot Renesas ARM Based SoC r8a7740 Multiplatform Updates for v3.18 2014-09-09 17:07:30 +02:00
board-ape6evm-reference.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-ape6evm.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-armadillo800eva.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-bockw-reference.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-bockw.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-koelsch-reference.c ARM: shmobile: koelsch-reference: Remove DU platform device 2014-10-30 09:47:13 +09:00
board-koelsch.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-kzm9g-reference.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-kzm9g.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-lager-reference.c ARM: shmobile: lager-reference: Remove DU platform device 2014-10-30 09:47:12 +09:00
board-lager.c ARM: shmobile: lager: Remove DU platform device 2014-12-02 07:25:01 +10:00
board-mackerel.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-marzen-reference.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
board-marzen.c ARM: shmobile: marzen: Remove DU platform device 2014-12-02 07:25:09 +10:00
clock-r8a73a4.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-r8a7740.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
clock-r8a7778.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-r8a7779.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-r8a7790.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
clock-r8a7791.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-sh73a0.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock-sh7372.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
clock.h ARM: shmobile: Move clock.h 2014-06-17 17:09:37 +09:00
common.h ARM: shmobile: Remove shmobile_setup_delay() 2014-08-22 11:31:56 +09:00
console.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
cpufreq.c cpufreq: cpu0: rename driver and internals to 'cpufreq_dt' 2014-10-03 15:37:54 +02:00
cpuidle.c ARM: shmobile: cpuidle: use init/exit common routine 2013-04-23 13:45:22 +02:00
dma-register.h ARM: shmobile: dma: Use defines instead of hardcoded numbers 2014-08-20 09:09:23 +09:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp-scu.S ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
headsmp.S ARM: SoC platform changes for 3.17 2014-08-08 11:14:29 -07:00
intc-sh73a0.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
intc-sh7372.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
intc.h ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h 2014-08-22 12:23:32 +09:00
irqs.h ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h 2014-08-22 12:23:32 +09:00
platsmp-apmu.c ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND 2014-07-06 16:31:56 +02:00
platsmp-scu.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
platsmp.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
pm-r8a7740.c ARM: SoC platform changes for 3.18 2014-10-08 17:13:04 -04:00
pm-r8a7779.c ARM: shmobile: Drop dev_irq_safe from r8a7779 genpd config 2014-09-09 00:46:11 +02:00
pm-r8a7790.c Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
pm-r8a7791.c ARM: shmobile: Allow r8a7791 to build non-SMP APMU code 2014-06-26 16:01:34 +09:00
pm-rcar.c ARM: shmobile: Cleanup pm-rcar.o build using Kconfig 2014-09-02 09:32:05 +09:00
pm-rcar.h ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case 2014-06-17 17:09:40 +09:00
pm-rmobile.c ACPI and power management updates for 3.18-rc1 2014-10-09 16:07:43 -04:00
pm-rmobile.h ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig 2014-09-02 09:32:06 +09:00
pm-sh73a0.c ARM: shmobile: Move common.h 2014-06-17 17:09:39 +09:00
pm-sh7372.c ARM: shmobile: Move sh7372.h 2014-06-25 16:50:00 +09:00
r8a73a4.h ARM: shmobile: r8a73a4: Use shmobile_init_delay() 2014-08-22 11:31:56 +09:00
r8a7740.h ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
r8a7778.h ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
r8a7779.h ARM: shmobile: marzen-reference: Enable TMU0 in device tree 2014-08-17 09:00:56 +09:00
r8a7790.h ARM: shmobile: lager-reference: Enable CMT0 in device tree 2014-08-17 09:00:55 +09:00
r8a7791.h ARM: shmobile: koelsch-reference: Enable CMT0 in device tree 2014-08-17 09:00:56 +09:00
rcar-gen2.h ARM: shmobile: Add shared R-Car Gen2 CMA reservation code 2014-06-17 19:33:22 +09:00
setup-emev2.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r7s72100.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a73a4.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7740.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7778.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7779.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7790.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7791.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-r8a7794.c ARM: shmobile: r8a7794: Reserve memory as other R-Car Gen2 SoCs 2014-09-16 15:01:58 +09:00
setup-rcar-gen2.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
setup-sh73a0.c Linux 3.18-rc7 2014-12-02 10:58:33 +10:00
setup-sh7372.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
sh-gpio.h ARM: shmobile: mackerel: Use pinconf API to configure pin pull-down 2013-12-10 17:24:49 +09:00
sh73a0.h ARM: shmobile: Move sh73a0.h 2014-06-25 16:49:37 +09:00
sh7372.h ARM: shmobile: Move sh7372.h 2014-06-25 16:50:00 +09:00
sleep-sh7372.S ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
smp-emev2.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
smp-r8a7779.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
smp-r8a7790.c Second Round of Renesas ARM Based SoC Updates for v3.17 2014-07-12 09:44:52 -07:00
smp-r8a7791.c ARM: shmobile: Allow r8a7791 to build non-SMP APMU code 2014-06-26 16:01:34 +09:00
smp-sh73a0.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00
suspend.c arm: Use generic idle loop 2013-04-08 17:39:24 +02:00
timer.c ARM: shmobile: Remove FSF address from copyright headers 2014-10-27 09:48:07 +09:00