Linus Torvalds 93bfbd71db Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks powerpc: Fix oops on some machines due to incorrect pr_debug() powerpc/ps3: Printing fixups for l64 to ll64 convserion drivers/net powerpc/5200: update device tree binding documentation powerpc/5200: Bugfix for PCI mapping of memory and IMMR powerpc/5200: update defconfigs		2009-02-02 19:26:44 -08:00
..
aty	fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks	2009-02-02 17:08:25 +11:00
backlight	backlight: Rename the corgi backlight driver to generic	2009-01-08 20:52:37 +00:00
console	fbdev: Kill Atari vblank cursor blinking	2009-01-12 20:56:43 +01:00
display	device create: video: convert device_create_drvdata to device_create	2008-10-16 09:24:45 -07:00
geode	pci: use pci_ioremap_bar() in drivers/video	2009-01-06 15:59:26 -08:00
i810	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
intelfb	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
kyro
logo	video/logo: add support for Blackfin/Linux logo for framebuffer console	2008-05-14 19:11:14 -07:00
matrox	matroxfb: support G200eV chip	2008-10-16 11:21:45 -07:00
mb862xx	drivers/video/mb862xx/mb862xxfb.c: fix printk	2008-12-10 08:01:54 -08:00
mbx	mbxfb: fix incorrect argument type	2008-03-10 18:01:20 -07:00
nvidia	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
omap	[ARM] omap: ensure OMAP drivers pass a struct device to clk_get()	2009-01-24 11:41:16 +00:00
pnx4008	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
riva	video: replace remaining __FUNCTION__ occurrences	2008-04-28 08:58:42 -07:00
savage	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
sis	video/sis/: remove compat code	2008-07-24 10:47:37 -07:00
vermilion	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
via	viafb: fix sparse warnings	2009-01-06 15:59:26 -08:00
68328fb.c
acornfb.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
acornfb.h
amba-clcd.c	[ARM] Fix realview build	2009-01-08 16:29:41 +00:00
amifb.c	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
arcfb.c
arkfb.c	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
asiliantfb.c
atafb.c	m68k: atafb - Kill warn_unused_result warnings	2009-01-12 20:56:40 +01:00
atafb.h
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atmel_lcdfb.c	drivers/video: bad error test before a dereference	2008-11-19 18:49:57 -08:00
au1100fb.c	au1100fb: fix modpost warnings	2007-10-18 14:37:17 -07:00
au1100fb.h
au1200fb.c
au1200fb.h
bf54x-lq043fb.c	video/framebuffer: fix bug: jpegview cannot work on framebuffer device other than 16BPP	2009-01-15 16:39:35 -08:00
bfin-t350mcqb-fb.c	video/framebuffer: fix bug: jpegview cannot work on framebuffer device other than 16BPP	2009-01-15 16:39:35 -08:00
bt431.h
bt455.h
bw2.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
c2p.h	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
c2p_core.h	fbdev: c2p/atafb - Add support for Atari interleaved bitplanes	2009-01-12 20:56:31 +01:00
c2p_iplan2.c	fbdev: c2p/atafb - Add support for Atari interleaved bitplanes	2009-01-12 20:56:31 +01:00
c2p_planar.c	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
carminefb.c	fb: carminefb: trivial annotation packing color register	2009-01-06 15:59:26 -08:00
carminefb.h	fbdev: add the carmine FB driver	2008-07-24 10:47:34 -07:00
carminefb_regs.h	fbdev: add the carmine FB driver	2008-07-24 10:47:34 -07:00
cfbcopyarea.c	fb: add support for foreign endianness	2008-04-28 08:58:35 -07:00
cfbfillrect.c	fb: add support for foreign endianness	2008-04-28 08:58:35 -07:00
cfbimgblt.c	video: replace remaining __FUNCTION__ occurrences	2008-04-28 08:58:42 -07:00
cg3.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
cg6.c	cg6: disable cursor when leaving graphics mode	2008-10-10 12:12:41 -07:00
cg14.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
chipsfb.c	PM: Introduce PM_EVENT_HIBERNATE callback state	2008-02-23 10:40:04 -08:00
cirrusfb.c	cirrusfb: remove unused variables	2008-11-19 18:49:59 -08:00
clps711xfb.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
cobalt_lcdfb.c	fbdev: add new Cobalt LCD framebuffer driver	2008-07-24 10:47:40 -07:00
controlfb.c	powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED	2008-12-21 14:21:16 +11:00
controlfb.h
cyber2000fb.c	pci: use pci_ioremap_bar() in drivers/video	2009-01-06 15:59:26 -08:00
cyber2000fb.h
cyblafb.c	drivers/video/: Spelling fixes	2008-02-03 17:31:49 +02:00
dnfb.c	m68k: dnfb doesnt check for Apollo	2008-05-18 13:28:49 -07:00
edid.h
efifb.c	efifb/imacfb consolidation + hardware support	2008-10-16 11:21:44 -07:00
epson1355fb.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
fb_ddc.c	i2c: Let framebuffer drivers set their I2C bus class to DDC	2008-07-14 22:38:28 +02:00
fb_defio.c	video: deferred io with physically contiguous memory	2008-12-22 18:44:48 +09:00
fb_draw.h	fb: add support for foreign endianness	2008-04-28 08:58:35 -07:00
fb_notify.c
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c	fbdev/logo: check compatibility of main and extra logos	2009-01-06 15:59:27 -08:00
fbmon.c	fbmon: fix EDID parser to detect interlace modes	2008-10-16 11:21:44 -07:00
fbsysfs.c
ffb.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
fm2fb.c
fsl-diu-fb.c	freescale DIU: bug fix: add sanity check for AOI position	2008-08-15 08:35:43 -07:00
fsl-diu-fb.h	fbdev: powerpc: driver for Freescale 8610 and 5121 DIU	2008-04-28 08:58:40 -07:00
g364fb.c
gbefb.c	gbefb: unsigned var->pixclock cannot be less than 0	2009-01-06 15:59:26 -08:00
gxt4500.c	pci: use pci_ioremap_bar() in drivers/video	2009-01-06 15:59:26 -08:00
hecubafb.c	fbdev: platforming hecubafb and n411	2008-04-28 08:58:41 -07:00
hgafb.c	hgafb: convert to new platform driver API	2008-07-24 10:47:39 -07:00
hitfb.c	video: Fix up hp6xx driver build regressions.	2008-07-30 02:16:12 +09:00
hpfb.c	m68k: Return -ENODEV if no device is found	2008-05-18 13:28:50 -07:00
igafb.c	drivers/video: add missing pci_dev_get	2008-02-06 10:41:16 -08:00
imsttfb.c	video: replace remaining __FUNCTION__ occurrences	2008-04-28 08:58:42 -07:00
imxfb.c	i.MX Framebuffer: add TFT support	2008-12-16 15:43:50 +01:00
Kconfig	fbdev: incorrect URL given in drivers/video/Kconfig	2009-01-29 18:04:44 -08:00
leo.c	leo: disable cursor when leaving graphics mode	2008-10-10 12:13:22 -07:00
macfb.c	macfb annotations and compiler warning fix	2008-12-28 20:00:05 +01:00
macmodes.c
macmodes.h
Makefile	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-01-26 10:13:08 -08:00
maxinefb.c
metronomefb.c	metronomefb: Fix warning when building 64bit	2008-10-15 10:19:51 -07:00
modedb.c	fbdev: fix typo in drivers/video/modedb.c	2009-01-06 15:59:26 -08:00
mx3fb.c	i.MX31: framebuffer driver	2009-01-21 10:32:34 -07:00
n411.c	fbdev: platforming hecubafb and n411	2008-04-28 08:58:41 -07:00
neofb.c	neofb: fix sparse warnings	2009-01-06 15:59:27 -08:00
offb.c	fbdev: Teaches offb about palette on radeon r5xx/r6xx	2008-07-22 10:39:36 +10:00
output.c	video: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:35 -08:00
p9100.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
platinumfb.c	platinumfb: Use linux/of_{device,platform}.h instead of asm	2008-06-09 13:46:38 +10:00
platinumfb.h
pm2fb.c	pm2fb: free cmap memory on module remove	2008-08-20 15:40:31 -07:00
pm3fb.c	pm3fb: fix sparse warning	2009-01-06 15:59:27 -08:00
pmag-aa-fb.c	fbcon: fix color generation for monochrome framebuffer	2008-02-06 10:41:18 -08:00
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c	powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video	2009-01-16 16:15:15 +11:00
pvr2fb.c	sh: More header path fixups for mach dir refactoring.	2008-07-29 22:10:01 +09:00
pxafb.c	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel	2008-12-29 18:08:11 +00:00
pxafb.h	[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices	2008-12-29 18:00:04 +08:00
q40fb.c
s1d13xxxfb.c	fbdev: allow more chip revisions in Epson s1d13... video driver	2008-10-16 11:21:45 -07:00
s3c2410fb.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
s3c2410fb.h	S3C2410: clean out changelog header and tidy	2008-05-24 09:56:13 -07:00
s3fb.c	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
sa1100fb.c	[ARM] remove memzero()	2008-11-27 12:37:59 +00:00
sa1100fb.h	sa1100fb: convert ctrlr_sem in a mutex	2008-07-24 10:47:37 -07:00
sbuslib.c	sparc video: remove open boot prom code	2008-05-08 21:37:30 -07:00
sbuslib.h	sparc video: remove open boot prom code	2008-05-08 21:37:30 -07:00
sgivwfb.c	x86, VisWS: turn into generic arch, move definitions	2008-07-10 18:55:40 +02:00
sh7760fb.c	sh: sh7760fb: Fix color pallette setting	2008-12-22 18:42:54 +09:00
sh_mobile_lcdcfb.c	video: sh_mobile_lcdcfb deferred io support	2008-12-22 18:44:48 +09:00
skeletonfb.c	skeletonfb: update to correct platform driver usage	2008-07-24 10:47:39 -07:00
sm501fb.c	sm501: unsigned ptr cannot be negative	2009-01-06 15:59:27 -08:00
sstfb.c	video: replace remaining __FUNCTION__ occurrences	2008-04-28 08:58:42 -07:00
sticore.h	video/console/stico{n,re}.c: make code static	2008-07-26 12:00:12 -07:00
stifb.c	video/stifb.c: make 2 functions static	2008-07-26 12:00:12 -07:00
sunxvr500.c	sparc video: remove open boot prom code	2008-05-08 21:37:30 -07:00
sunxvr2500.c	sparc video: remove open boot prom code	2008-05-08 21:37:30 -07:00
svgalib.c	svgalib: mode selection updates	2007-10-16 09:43:22 -07:00
syscopyarea.c	fb: add support for foreign endianness	2008-04-28 08:58:35 -07:00
sysfillrect.c	fb: add support for foreign endianness	2008-04-28 08:58:35 -07:00
sysimgblt.c	video: replace remaining __FUNCTION__ occurrences	2008-04-28 08:58:42 -07:00
tcx.c	sparc: Annotate of_device_id arrays with const or __initdata.	2008-08-31 01:23:17 -07:00
tdfxfb.c	tdfxfb: do not make changes to default tdfx_fix	2008-10-16 11:21:42 -07:00
tgafb.c	tgafb: remove a redundant non-mono test in mono imageblit	2007-10-16 09:43:23 -07:00
tmiofb.c	tmiofb: fix compilation with ACCEL disabled	2008-11-19 18:49:58 -08:00
tridentfb.c	tridentfb: remove warning message that cyblafb driver should be used	2008-07-24 10:47:36 -07:00
uvesafb.c	uvesafb: don't treat mode info retrieval failures as errors	2008-10-16 11:21:44 -07:00
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c	vfb: only enable if explicitly requested when compiled in	2008-07-24 10:47:39 -07:00
vga16fb.c	vga16fb: remove open_lock mutex	2008-10-16 11:21:42 -07:00
vgastate.c
vt8623fb.c	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
w100fb.c	w100fb: add 80 MHz modeline	2008-07-04 10:40:08 -07:00
w100fb.h
xen-fbfront.c	get xenbus_driver ->probe() "recognized" by modpost	2008-11-30 10:03:38 -08:00
xilinxfb.c	powerpc/virtex: fix various format/casting printk mismatches	2008-11-14 09:59:48 -07:00