msm-4.14

mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00

History

Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-01-07 11:51:28 +00:00

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

asm-generic

asm-generic/unistd.h: support new process_vm_{readv,write} syscalls

2011-12-03 15:31:48 -05:00

crypto

…

drm

drm/radeon/kms: add some new pci ids

2011-12-14 12:29:03 +00:00