linux/drivers/video/riva
Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next
Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
2010-12-22 18:57:02 +01:00
..
fbdev.c backlight: constify backlight_ops 2010-11-16 14:14:02 +01:00
Makefile
nv_driver.c
nv_type.h
nvreg.h
riva_hw.c
riva_hw.h
riva_tbl.h
rivafb-i2c.c i2c: Delete unused adapter IDs 2010-11-15 22:40:38 +01:00
rivafb.h