Mark Brown bb0dddf615 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android ...

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/crypto/Makefile
	arch/arm64/crypto/aes-glue.c
	arch/arm64/crypto/ghash-ce-core.S
	arch/arm64/crypto/ghash-ce-glue.c
	arch/arm64/include/asm/ptrace.h
	arch/arm64/include/asm/thread_info.h
	arch/arm64/kernel/fpsimd.c
	crypto/ablk_helper.c
	drivers/base/cpu.c
	drivers/hid/hid-core.c
	net/ipv4/raw.c

2014-09-08 12:05:48 +01:00

..

asm-generic

seccomp: add "seccomp" syscall

2014-08-28 01:51:54 +00:00

drm

drm/tegra: Remove gratuitous pad field

2014-06-07 13:25:32 -07:00

linux

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-09-08 12:05:48 +01:00

mtd

UAPI: (Scripted) Disintegrate include/mtd

2012-10-09 09:49:09 +01:00

rdma

IB/uverbs: Implement memory windows support in uverbs

2013-02-21 11:59:09 -08:00

scsi

[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

2013-03-01 09:10:08 +00:00

sound

ALSA: compress: Cancel the optimization of compiler and fix the size of struct for all platform.

2014-06-26 15:12:41 -04:00

video

video: adf: ensure consistent alignment on userspace facing structs

2014-03-27 10:20:42 -07:00

xen

UAPI: (Scripted) Disintegrate include/xen

2012-10-09 09:49:15 +01:00

Kbuild

UAPI: (Scripted) Set up UAPI Kbuild files

2012-10-02 18:01:35 +01:00