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

staging: Add framebuffer driver for XGI chipsets

2010-06-04 13:38:51 -07:00

Makefile

staging: xgifb: delete vb_ext.{c,h}

2011-11-26 18:03:18 -08:00

TODO

staging: xgifb: update TODO

2011-09-16 20:16:48 +02:00

vb_def.h

staging/xgifb: remove remaining duplicate initdef.h defines

2012-02-10 09:56:25 -08:00

vb_init.c

Merge 3.4-rc5 into staging-next

2012-05-02 11:48:07 -07:00

vb_init.h

staging: xgifb: inline XGIfb_query_VGA_config_space()

2011-10-12 09:51:45 -06:00

vb_setmode.c

Merge 3.4-rc5 into staging-next

2012-05-02 11:48:07 -07:00

vb_setmode.h

staging: xgifb: move XGI21_LVDSCapStruct into xgifb_video_info

2011-12-08 12:26:07 -08:00

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

staging: xgifb: unify #include order

2011-09-16 20:16:48 +02:00

vb_util.h

staging: xgifb: clean up register access types

2011-03-14 11:52:34 -07:00

vgatypes.h

staging/xgifb: simplify vga I/O ports handling

2012-04-10 09:52:58 -07:00

XGI_main_26.c

staging: xgifb: eliminate string comparison from mode search

2012-04-10 10:19:08 -07:00

XGI_main.h

staging: xgifb: unwrap mode table lines

2012-04-10 10:20:07 -07:00

XGIfb.h

staging: xgifb: drop XG45 code

2012-04-10 10:19:07 -07:00