Greg Kroah-Hartman e4c5bf8e3d Merge 'staging-next' to Linus's tree ... 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>		2010-10-28 09:44:56 -07:00
..
Kconfig	staging: Add framebuffer driver for XGI chipsets	2010-06-04 13:38:51 -07:00
Makefile	Staging: xgifb: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:41 -07:00
TODO	ASoC: Change my mail address	2010-09-15 12:03:58 +01:00
XGI_accel.c	Staging: xgifb: remove externs in XGI_accel.c	2010-06-22 14:33:36 -07:00
XGI_accel.h	Staging: xgifb: fix lots of sparse warnings	2010-08-31 14:51:53 -07:00
XGI_main.h	Staging: xgifb: fix lots of sparse warnings	2010-08-31 14:51:53 -07:00
XGI_main_26.c	staging: xgifb: Removes unnecesary log	2010-09-08 02:07:12 -07:00
XGIfb.h	Staging: xgifb: remove __KERNEL__ #ifdef in XGIfb.h	2010-06-22 14:33:36 -07:00
vb_def.h	Staging: xgifb: Remove use of LINUX_KERNEL define	2010-06-22 14:20:44 -07:00
vb_ext.c	Staging: xgifb: fixed many style issue in vb_ext.c	2010-09-04 21:36:31 -07:00
vb_ext.h	Staging: xgifb: Remove typedefs in vb_struct.h	2010-06-22 14:33:34 -07:00
vb_init.c	Staging: xgifb: fixed many style issues in vb_init.c	2010-09-04 21:43:01 -07:00
vb_init.h	Staging: xgifb: Remove typedefs in vb_struct.h	2010-06-22 14:33:34 -07:00
vb_setmode.c	Staging: xgifb: revert a warning fix and resolve it properly	2010-09-08 01:49:45 -07:00
vb_setmode.h	Staging: xgifb: Remove typedefs in vb_struct.h	2010-06-22 14:33:34 -07:00
vb_struct.h	Staging: xgifb: Remove typedefs in vb_struct.h	2010-06-22 14:33:34 -07:00
vb_table.h	Staging: xgifb: fix lots of sparse warnings	2010-08-31 14:51:53 -07:00
vb_util.c	Staging: xgifb: fixed many style issues in vb_util.c	2010-09-04 21:44:02 -07:00
vb_util.h	Staging: xgifb: Remove SHORT, UCHAR, and LONG typedef	2010-06-22 14:33:19 -07:00
vgatypes.h	Staging: xgifb: increase VBIOS_VER_MAX_LENGTH to 5	2010-06-22 14:33:36 -07:00