leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f34b6cd3ee
linux/drivers/staging/android
History
Greg Kroah-Hartman 7ca363f687 Merge branch 'staging-linus' into staging-work 
This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-08 13:38:28 -08:00
..
ion Merge branch 'staging-linus' into staging-work 2014-02-08 13:38:28 -08:00
trace staging: sync: Add tracepoint support 2013-03-04 17:46:55 +08:00
uapi ion_test: Add compat_ioctl support (v2) 2013-12-19 16:10:25 -08:00
alarm-dev.c staging: alarm-dev: Seperate functions with one blank line 2013-11-19 15:33:39 -08:00
android_alarm.h
ashmem.c staging: ashmem: Avoid deadlock between read and mmap calls 2014-02-07 09:03:16 -08:00
ashmem.h staging: android: ashmem: Add support for 32bit ashmem calls in a 64bit kernel 2013-03-06 08:49:43 +08:00
binder_trace.h
binder.c Staging: android: Mark local functions in binder.c as static 2013-09-17 07:47:39 -07:00
binder.h staging: android: binder: fix binder interface for 64bit compat layer 2013-07-23 14:37:22 -07:00
Kconfig gpu: ion: Add ION Memory Manager 2013-12-14 08:50:15 -08:00
logger.c Merge git://git.kvack.org/~bcrl/aio-next 2013-09-13 10:55:58 -07:00
logger.h staging: android: logger: use kuid_t instead of uid_t 2013-05-16 15:37:51 -07:00
lowmemorykiller.c drivers: convert shrinkers to new count/scan API 2013-09-10 18:56:32 -04:00
Makefile ion: Reenable the build 2013-12-15 09:40:11 -08:00
ram_console.h
sw_sync.c android/sw_sync: use get_unused_fd_flags(O_CLOEXEC) instead of get_unused_fd() 2013-08-15 17:26:44 -07:00
sw_sync.h staging: sw_sync: Add stubs for kernels without CONFIG_SW_SYNC 2014-02-07 09:03:16 -08:00
sync.c staging: android: sync: Signal pt before sync_timeline object gets destroyed 2014-02-07 09:36:27 -08:00
sync.h staging: android: Fix typo in android/sync.h 2013-11-11 16:22:17 -08:00
timed_gpio.c
timed_gpio.h
timed_output.c staging: android: timed_output: fix sysfs file creation race 2013-08-24 10:27:29 -07:00
timed_output.h Staging: android: Remove extern from function prototypes in .h files 2013-09-17 07:47:39 -07:00
TODO