projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2fbe170) | patch
staging: android: ion: Merge ion-ioctl.c into ion.c
authorAndrew F. Davis <afd@ti.com>
Fri, 11 Jan 2019 18:05:12 +0000 (12:05 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Jan 2019 09:42:27 +0000 (10:42 +0100)
commit4514e79e5a6b2aa846b0b771270a8b655ef5001d
treef1810792b2788ec48530501827178203fc51a74ctree | snapshot
parent2fbe1707bae2ba9f5f4f5dc96a26797ff3353b1fcommit | diff
staging: android: ion: Merge ion-ioctl.c into ion.c

The file ion-ioctl.c is now much to small and tightly integrated
with the main ion.c file to justify keeping it separate. Merge
this file.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/Makefile diff | blob | history
drivers/staging/android/ion/ion-ioctl.c [deleted file] blob | history
drivers/staging/android/ion/ion.c diff | blob | history
drivers/staging/android/ion/ion.h diff | blob | history
John Crispins staging tree