e4c5bf8e3d
This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
camera | ||
include | ||
qdsp5 | ||
generic_gpio.c | ||
gpio_axis.c | ||
gpio_event.c | ||
gpio_input.c | ||
gpio_matrix.c | ||
gpio_output.c | ||
Kconfig | ||
Makefile | ||
pmem.c | ||
synaptics_i2c_rmi.c | ||
synaptics_i2c_rmi.h | ||
TODO |