Huang, Tao 1ca180425c Merge tag 'lsk-v3.10-android-15.02' ...

LSK Android 15.02 v3.10

Conflicts:
	drivers/Kconfig
	drivers/regulator/core.c
	include/linux/of.h

2015-03-05 17:11:40 +08:00

..

fiq_debugger

fiq_debugger: rockchip: fix compilation error on arm64

2014-10-23 17:03:52 +08:00

ion

Merge tag 'lsk-v3.10-android-15.02'

2015-03-05 17:11:40 +08:00

trace

rk: ion: fix compile warnning

2015-03-04 10:39:18 +08:00

uapi

Merge tag 'lsk-v3.10-android-15.02'

2015-03-05 17:11:40 +08:00

alarm-dev.c

staging: android: fix missing a blank line after declarations

2015-01-13 22:39:50 +00:00

android_alarm.h

drivers: staging: android: split uapi out of android_alarm.h

2013-11-07 15:18:38 -08:00

ashmem.c

staging: android: ashmem: Avoid deadlock with mmap/shrink

2014-08-11 17:16:04 -07:00

ashmem.h

drivers: staging: android: split uapi out of ashmem.h

2013-11-07 15:18:38 -08:00

Kconfig

staging: android: binder: move to the "real" part of the kernel

2015-01-13 22:46:36 +00:00

logger.c

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

2015-02-20 14:29:33 +09:00

logger.h

staging: android: logger: use kuid_t instead of uid_t

2013-05-16 15:37:51 -07:00

lowmemorykiller.c

rk: lowmemorykiller: calculator free pages exclude CMA's free

2014-06-23 10:11:35 +08:00

Makefile

staging: android: binder: move to the "real" part of the kernel

2015-01-13 22:46:36 +00:00

ram_console.h

staging: android: ram_console: pass in a boot info string

2011-11-30 21:23:37 +09:00

sw_sync.c

staging: android: fix missing a blank line after declarations

2015-01-13 22:39:50 +00:00

sw_sync.h

drivers: staging: android: split uapi out of sync.h and sw_sync.h

2013-11-07 15:18:39 -08:00

sync.c

staging: android: fix missing a blank line after declarations

2015-01-13 22:39:50 +00:00

sync.h

Told to update this issue to avoid midgard compile warning

2014-06-19 10:40:55 +08:00

timed_gpio.c

staging: android: fix missing a blank line after declarations

2015-01-13 22:39:50 +00:00

timed_gpio.h

Staging: android: timed_gpio: Removed spaces before tabs

2012-02-29 15:52:52 -08:00

timed_output.c

staging: Android: Fix some checkpatch warnings

2012-06-12 11:20:17 -07:00

timed_output.h

Revert "Staging: android: delete android drivers"

2011-11-30 20:18:14 +09:00