Linus Torvalds 4406c56d0a Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits) PCI hotplug: clean up acpi_run_hpp() PCI hotplug: acpiphp: use generic pci_configure_slot() PCI hotplug: shpchp: use generic pci_configure_slot() PCI hotplug: pciehp: use generic pci_configure_slot() PCI hotplug: add pci_configure_slot() PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation PCI: Clear saved_state after the state has been restored PCI PM: Return error codes from pci_pm_resume() PCI: use dev_printk in quirk messages PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset() PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle PCI Hotplug: acpiphp: find bridges the easy way PCI: pcie portdrv: remove unused variable PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support ACPI PM: Replace wakeup.prepared with reference counter PCI PM: Introduce device flag wakeup_prepared PCI / ACPI PM: Rework some debug messages PCI PM: Simplify PCI wake-up code ... Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree scanning having been moved and merged for the 32- and 64-bit cases. The 'needs_freset' initialization added in 6e19314cc ("PCI/powerpc: support PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.		2009-09-16 07:49:54 -07:00
..
aty	atyfb: fix alignment for block writes	2009-06-30 18:56:01 -07:00
backlight	Merge branch 'devel-stable' into devel	2009-09-12 12:02:26 +01:00
console	fbcon: don't use vc_resize() on initialization	2009-08-07 10:39:56 -07:00
display
geode
i810	i810fb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-08 09:19:49 -07:00
intelfb	intelfb: fix a bug when changing video timing	2009-06-16 19:48:00 -07:00
kyro
logo	fbdev: move logo externs to header file	2009-06-16 19:47:57 -07:00
matrox	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
mb862xx	mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF	2009-06-16 19:47:59 -07:00
mbx
nvidia	nvidiafb: fix boot-time printk string	2009-06-23 12:50:05 -07:00
omap	omap: video: remove direct access of driver_data	2009-07-12 13:02:10 -07:00
pnx4008
riva
savage
sis	sisfb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-06 13:44:37 -07:00
vermilion
via	viafb: fix rmmod bug	2009-08-07 10:39:56 -07:00
68328fb.c
acornfb.c	acornfb: remove fb_mmap function	2009-06-16 19:47:59 -07:00
acornfb.h
amba-clcd.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
amifb.c
arcfb.c
arkfb.c
asiliantfb.c
atafb_iplan2p2.c
atafb_iplan2p4.c
atafb_iplan2p8.c
atafb_mfb.c
atafb_utils.h
atafb.c	atafb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-08 09:19:49 -07:00
atafb.h
atmel_lcdfb.c	Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel	2009-09-12 12:01:34 +01:00
au1100fb.c
au1100fb.h
au1200fb.c
au1200fb.h
bf54x-lq043fb.c	fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset	2009-06-16 19:48:03 -07:00
bfin-t350mcqb-fb.c	fbdev: *bfin*: fix __dev{init,exit} markings	2009-06-16 19:48:03 -07:00
broadsheetfb.c
bt431.h
bt455.h
bw2.c	bw2: use standard fields for framebuffer physical address and length	2009-06-16 04:56:30 -07:00
c2p_core.h
c2p_iplan2.c
c2p_planar.c
c2p.h
carminefb_regs.h
carminefb.c	carminefb: fix possible access beyond end of carmine_modedb[]	2009-06-16 19:47:59 -07:00
carminefb.h
cfbcopyarea.c
cfbfillrect.c
cfbimgblt.c
cg3.c	cg3: use standard fields for framebuffer physical address and length	2009-06-16 04:56:34 -07:00
cg6.c	cg6: use standard fields for framebuffer physical address and length	2009-06-16 04:56:35 -07:00
cg14.c	cg14: use standard fields for framebuffer physical address and length	2009-06-16 04:56:31 -07:00
chipsfb.c	chipsfb: remove redundant assignment	2009-06-16 19:47:58 -07:00
cirrusfb.c
clps711xfb.c
cobalt_lcdfb.c	Update Yoichi Yuasa's e-mail address	2009-07-03 15:45:29 +01:00
controlfb.c
controlfb.h
cyber2000fb.c	cyber2000fb.c: use proper method for stopping unload if CONFIG_ARCH_SHARK	2009-06-12 21:46:53 +09:30
cyber2000fb.h
dnfb.c
edid.h
efifb.c	fbdev: add support for handoff from firmware to hw framebuffers	2009-06-16 19:48:00 -07:00
epson1355fb.c
fb_ddc.c
fb_defio.c
fb_draw.h
fb_notify.c
fb_sys_fops.c
fbcmap.c
fbcvt.c
fbmem.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
fbmon.c	fbmon: work around compiler bug in gcc-2.4.2	2009-07-22 08:49:22 -07:00
fbsysfs.c	Revert "fb: Initialize fb_info mutexes in framebuffer_alloc()"	2009-07-08 09:20:11 -07:00
ffb.c
fm2fb.c
fsl-diu-fb.c	fsl-diu-fb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-08 14:18:35 -07:00
fsl-diu-fb.h
g364fb.c
gbefb.c
gxt4500.c
hecubafb.c
hgafb.c
hitfb.c	video: hitfb: Move over to dev_pm_ops.	2009-07-07 11:50:57 +09:00
hpfb.c
igafb.c	igafb: use framebuffer_alloc() to allocate fb_info struct	2009-06-16 19:47:58 -07:00
imsttfb.c
imxfb.c	imxfb: Add support for multiple displays	2009-08-07 12:10:56 +02:00
Kconfig	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-09-16 07:49:54 -07:00
leo.c	leo: use standard fields for framebuffer physical address and length	2009-06-16 04:56:37 -07:00
macfb.c
macmodes.c
macmodes.h
Makefile	fb: add support of LCD display controller on pxa168/910 (base layer)	2009-06-13 00:09:09 +08:00
maxinefb.c
metronomefb.c
modedb.c	fbdev: add video modes for resolutions and timings of PAL RGB	2009-06-16 19:47:58 -07:00
mx3fb.c	i.MX31: fix framebuffer locking regressions	2009-08-07 10:39:56 -07:00
n411.c
neofb.c
offb.c	fbdev: use framebuffer_release() for freeing fb_info structures	2009-06-16 19:48:00 -07:00
output.c
p9100.c	p9100: use standard fields for framebuffer physical address and length	2009-06-16 04:56:38 -07:00
platinumfb.c	fbdev: add mutex for fb_mmap locking	2009-06-30 18:56:00 -07:00
platinumfb.h
pm2fb.c	fbdev: use framebuffer_release() for freeing fb_info structures	2009-06-16 19:48:00 -07:00
pm3fb.c
pmag-aa-fb.c
pmag-ba-fb.c
pmagb-b-fb.c
ps3fb.c	powerpc/cell: Move CBE_IOPTE_* to <asm/cell-regs.h>	2009-08-20 10:29:26 +10:00
pvr2fb.c
pxa168fb.c	fb: add support of LCD display controller on pxa168/910 (base layer)	2009-06-13 00:09:09 +08:00
pxa168fb.h	fb: add support of LCD display controller on pxa168/910 (base layer)	2009-06-13 00:09:09 +08:00
pxafb.c	fbdev: add mutex for fb_mmap locking	2009-06-30 18:56:00 -07:00
pxafb.h
q40fb.c
s1d13xxxfb.c	fbdev: s1d13xxxfb: add accelerated bitblt functions	2009-06-16 19:48:00 -07:00
s3c2410fb.c	s3c-fb: CPUFREQ frequency scaling support	2009-06-16 19:47:59 -07:00
s3c2410fb.h	s3c-fb: CPUFREQ frequency scaling support	2009-06-16 19:47:59 -07:00
s3c-fb.c	s3c-fb: fix off-by-one bug in loop indexes	2009-07-29 19:10:34 -07:00
s3fb.c
sa1100fb.c	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
sa1100fb.h
sbuslib.c
sbuslib.h
sgivwfb.c
sh7760fb.c	fbdev: add mutex for fb_mmap locking	2009-06-30 18:56:00 -07:00
sh_mobile_lcdcfb.c	sh: skip disabled LCDC channels	2009-08-15 12:58:42 +09:00
skeletonfb.c
sm501fb.c	sm501fb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-09 20:44:44 -07:00
sstfb.c
sticore.h
stifb.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
sunxvr500.c
sunxvr2500.c
svgalib.c
syscopyarea.c
sysfillrect.c
sysimgblt.c
tcx.c	tcx: use standard fields for framebuffer physical address and length	2009-06-16 19:48:00 -07:00
tdfxfb.c	i2c: Do not probe for TV chips on Voodoo3 adapters	2009-06-15 18:01:48 +02:00
tgafb.c
tmiofb.c
tridentfb.c
uvesafb.c	connector: make callback argument type explicit	2009-07-17 10:13:21 -07:00
valkyriefb.c
valkyriefb.h
vesafb.c	fbdev: add support for handoff from firmware to hw framebuffers	2009-06-16 19:48:00 -07:00
vfb.c
vga16fb.c
vgastate.c
vt8623fb.c
w100fb.c	w100fb: fix regression with uninitalized fb_info->mm_lock mutex	2009-07-08 09:19:49 -07:00
w100fb.h
xen-fbfront.c	xenfb: connect to backend before registering fb	2009-08-27 12:31:18 -07:00
xilinxfb.c	fbdev/xilinxfb: Fix improper casting and tighen up probe path	2009-06-17 00:30:02 -06:00