![]() 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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
TODO | ||
vb_def.h | ||
vb_ext.c | ||
vb_ext.h | ||
vb_init.c | ||
vb_init.h | ||
vb_setmode.c | ||
vb_setmode.h | ||
vb_struct.h | ||
vb_table.h | ||
vb_util.c | ||
vb_util.h | ||
vgatypes.h | ||
XGI_accel.c | ||
XGI_accel.h | ||
XGI_main.h | ||
XGI_main_26.c | ||
XGIfb.h |