Alex Deucher
2f299d5de0
drm/radeon/kms: adjust quirk for acer laptop ...
Acer laptop (TravelMate 5730G) has an HDMI connector
on the laptop and a DVI connector on the docking station
and both share the same encoder, hpd pin, and ddc line.
The bios connector table reflects this and is technically
correct, however, we drop the DVI connector here since
xrandr has no concept of encoders (only crtcs and connectors)
and will try and drive both connectors with different crtcs
which isn't possible on the hardware side and leaves no crtcs
for LVDS or VGA.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=32732
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-01-06 12:59:20 +10:00
Merge branches 'bugzilla-25412' and 'bugzilla-25302' into release
2010-12-26 17:05:07 -05:00
pata_cs5536: avoid implicit MSR API inclusion on x86-64
2010-12-26 19:42:15 -05:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
Fix build error in drivers/block/cciss.c
2010-12-20 21:21:49 -08:00
Bluetooth: add NULL pointer check in HCI
2010-12-08 13:22:22 -02:00
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
2011-01-05 08:31:08 +10:00
clocksource: sh_cmt: Remove nested spinlock fix
2010-12-17 19:38:33 +09:00
connector: add module alias
2010-12-10 12:27:49 -08:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2011-01-03 11:48:54 -08:00
amd64_edac: Fix interleaving check
2010-12-08 19:52:54 +01:00
firewire: ohci: fix regression with Agere FW643 rev 06, disable MSI
2010-12-12 15:47:02 +01:00
cs5535-gpio: handle GPIO regs where higher (clear) bits are set
2010-12-23 15:31:48 -08:00
drm/radeon/kms: adjust quirk for acer laptop
2011-01-06 12:59:20 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2010-12-02 17:40:04 -08:00
hwmon: (s3c-hwmon) Fix compilation
2011-01-02 15:31:11 -08:00
i2c_intel_mid: Fix slash in sysfs name
2010-12-14 18:46:01 -08:00
intel_idle: recognize ARAT on WSM-EX
2010-12-02 01:19:32 -05:00
IB/uverbs: Handle large number of entries in poll CQ
2010-12-08 15:23:49 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-12-16 08:33:44 -08:00
isdn: icn: Fix stack corruption bug.
2010-11-24 11:19:05 -08:00
led_class: fix typo in blink API
2010-12-22 19:43:34 -08:00
leds: fix up dependencies
2010-12-02 14:51:15 -08:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2010-12-20 09:19:46 -08:00
[media] em28xx: radio_fops should also use unlocked_ioctl
2011-01-03 09:52:25 -02:00
mfd: Support additional parent IDs for wm831x
2010-12-22 12:05:22 +01:00
drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove()
2010-11-25 06:50:47 +09:00
mmc: Fix re-probing with PM_POST_RESTORE notification
2010-12-21 11:46:49 -08:00
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2010-12-14 17:36:35 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 12:06:56 -08:00
of/i2c: Fix request module by alias
2010-12-24 01:28:54 -07:00
parisc: KittyHawk LCD fix
2010-12-04 11:18:25 -05:00
PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
2010-12-23 12:51:49 -08:00
ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
2010-12-04 12:47:48 +00:00
drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915.
2010-12-23 09:51:36 +00:00
ACPI/PNP: avoid section mismatch warning
2010-12-11 02:01:47 -05:00
regulator: tps6586x: correct register table
2010-12-09 09:23:43 +00:00
rtc: rs5c372: fix buffer size
2010-12-22 19:43:34 -08:00
[SCSI] zfcp: Issue FCP command without holding SCSI host_lock
2010-12-09 09:41:23 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
2010-12-24 12:58:43 -08:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
2010-12-14 14:35:04 -08:00
sh: intc: Initialize radix tree gfp mask explicitly.
2010-12-24 19:38:37 +09:00
spi/m68knommu: Coldfire QSPI platform support
2010-12-29 23:28:25 -07:00
ssb: b43-pci-bridge: Add new vendor for BCM4318
2010-11-22 15:19:31 -05:00
Revert "Staging: zram: work around oops due to startup ordering snafu"
2010-12-30 12:07:22 -08:00
n_gsm: gsm_data_alloc buffer allocation could fail and it is not being checked
2010-12-16 13:03:13 -08:00
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2010-12-20 21:33:12 -08:00
vhost: correctly set bits of dirty pages
2010-11-29 10:26:55 +02:00
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6
2010-12-27 10:33:30 -08:00
virtio: fix format of sysfs driver/vendor files
2010-11-24 15:21:12 +10:30
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
2010-12-22 12:05:21 +01:00
Merge branch '2.6.37-rc4-pvhvm-fixes' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
2010-12-03 11:30:57 -08:00
2f299d5de0