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

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nv_driver.c

fbdev: nv: fix sparse noise

2008-04-28 08:58:40 -07:00

nv_type.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nvreg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

riva_hw.c

fbdev: nv: fix sparse noise

2008-04-28 08:58:40 -07:00

riva_hw.h

[PATCH] atyfb, rivafb: minor fixes

2006-12-08 08:29:05 -08:00

riva_tbl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rivafb-i2c.c

i2c: Delete unused adapter IDs

2010-11-15 22:40:38 +01:00

rivafb.h

rivafb/nvidiafb: Various cleanups

2007-05-08 11:15:28 -07:00