Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
Kconfig
Makefile
TODO
vb_def.h
vb_init.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
vb_init.h
vb_setmode.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
vb_setmode.h
vb_struct.h	staging: xgifb: eliminate redundant struct definition	2012-04-10 10:20:09 -07:00
vb_table.h	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
vb_util.c
vb_util.h
vgatypes.h
XGI_main_26.c
XGI_main.h
XGIfb.h