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
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
matrox
mb862xx	drivers/video/mb862xx/mb862xxfb.c: fix printk	2008-12-10 08:01:54 -08:00
mbx
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
riva
savage	i2c: Delete many unused adapter IDs	2009-01-26 21:19:52 +01:00
sis
vermilion
via	viafb: fix sparse warnings	2009-01-06 15:59:26 -08:00
68328fb.c
acornfb.c
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
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c	m68k: atafb - Kill warn_unused_result warnings	2009-01-12 20:56:40 +01:00
atafb.h
atmel_lcdfb.c	drivers/video: bad error test before a dereference	2008-11-19 18:49:57 -08:00
au1100fb.c
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
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
c2p.h	fbdev: c2p - Rename c2p to c2p_planar	2009-01-12 20:56:32 +01:00
carminefb_regs.h
carminefb.c	fb: carminefb: trivial annotation packing color register	2009-01-06 15:59:26 -08:00
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c
cg6.c
cg14.c
chipsfb.c
cirrusfb.c	cirrusfb: remove unused variables	2008-11-19 18:49:59 -08:00
clps711xfb.c
cobalt_lcdfb.c
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
dnfb.c
edid.h
efifb.c
epson1355fb.c
fb_ddc.c
fb_defio.c	video: deferred io with physically contiguous memory	2008-12-22 18:44:48 +09:00
fb_draw.h
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
fbsysfs.c
ffb.c
fm2fb.c
fsl-diu-fb.c
fsl-diu-fb.h
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
hgafb.c
hitfb.c
hpfb.c
igafb.c
imsttfb.c
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
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
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
neofb.c	neofb: fix sparse warnings	2009-01-06 15:59:27 -08:00
offb.c
output.c	video: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:35 -08:00
p9100.c
platinumfb.c
platinumfb.h
pm2fb.c
pm3fb.c	pm3fb: fix sparse warning	2009-01-06 15:59:27 -08:00
pmag-aa-fb.c
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
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
s3c2410fb.c
s3c2410fb.h
s3fb.c
sa1100fb.c	[ARM] remove memzero()	2008-11-27 12:37:59 +00:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
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
sm501fb.c	sm501: unsigned ptr cannot be negative	2009-01-06 15:59:27 -08:00
sstfb.c
sticore.h
stifb.c
sunxvr500.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c
tdfxfb.c
tgafb.c
tmiofb.c	tmiofb: fix compilation with ACCEL disabled	2008-11-19 18:49:58 -08:00
tridentfb.c
uvesafb.c
valkyriefb.c
valkyriefb.h
vesafb.c
vfb.c
vga16fb.c
vgastate.c
vt8623fb.c
w100fb.c
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