Henrik Rydberg
273a50fbcd
nouveau: Set special lane map for the right chipset
...
The refactoring of the nv50 logic, introduced in 8663bc7c , modified the
test for the special lane map used on some Apple computers with Nvidia
chipsets. The tested MBA3,1 would still boot, but resume from suspend
stopped working. This patch restores the old test, which fixes the problem.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-04-19 16:37:53 +01:00
..
accessibility
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-04-06 19:56:04 -07:00
amba
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
ata
atm
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
auxdisplay
base
drivers/base: fix compiler warning in SoC export driver - idr should be ida
2012-04-09 14:54:22 -07:00
bcma
bcma: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
block
Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block
2012-04-13 18:45:13 -07:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
cdrom
char
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
clk
clocksource
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
2012-04-12 00:05:05 +02:00
connector
cpufreq
cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
2012-04-13 17:57:40 -07:00
cpuidle
Merge branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04:00
crypto
dca
devfreq
ARM: global cleanups
2012-03-27 16:03:32 -07:00
dio
dma
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -07:00
edac
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07:00
eisa
firewire
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
firmware
gpio
gpio/exynos: Fix compiler warning in gpio-samsung.c file
2012-04-10 22:15:39 -06:00
gpu
nouveau: Set special lane map for the right chipset
2012-04-19 16:37:53 +01:00
hid
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
hsi
hv
hwmon
hwmon: (pmbus_core) Fix compiler warning
2012-04-09 12:17:38 -07:00
hwspinlock
i2c
i2c: prevent spurious interrupt on Designware controllers
2012-04-10 08:09:03 -07:00
ide
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
idle
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
ieee802154
infiniband
Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on
2012-04-12 18:51:32 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-04-12 12:49:07 -07:00
iommu
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
isdn
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
leds
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
lguest
macintosh
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mca
md
md/bitmap: prevent bitmap_daemon_work running while initialising bitmap
2012-04-12 16:05:06 +10:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-11 11:05:34 -07:00
memstick
message
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mfd
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
mmc
mmc: use really long write timeout to deal with crappy cards
2012-04-05 20:32:34 -04:00
mtd
fix breakage in mtdchar_open(), sanitize failure exits
2012-04-09 01:38:55 -04:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-12 14:04:33 -07:00
nfc
nubus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
of
gpio: Fix range check in of_gpio_simple_xlate()
2012-04-10 14:20:56 -06:00
oprofile
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
parisc
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
parport
pci
PCI: Fix regression in pci_restore_state(), v3
2012-04-15 13:06:29 -07:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pinctrl
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
pnp
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
power
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
pps
ps3
ptp
rapidio
regulator
regulator: Fix a build warning in the anatop driver for 3.4
2012-04-10 10:26:41 -07:00
remoteproc
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
rpmsg
rtc
drivers/rtc/rtc-pl031.c: enable clock on all ST variants
2012-04-12 13:12:12 -07:00
s390
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
sbus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
scsi
SCSI: Fix error handling when no ULD is attached
2012-04-15 11:08:53 -07:00
sfi
sh
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
sn
spi
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
2012-04-15 17:35:19 -07:00
ssb
staging
Staging tree fixes for 3.4-rc2
2012-04-12 15:35:12 -07:00
target
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
tc
thermal
tty
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
uio
usb
xHCI: Correct the #define XHCI_LEGACY_DISABLE_SMI
2012-04-11 08:31:06 -07:00
uwb
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
vhost
video
ARM: a few more SoC fixes for 3.4-rc
2012-04-15 11:14:54 -07:00
virt
virtio
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
vlynq
w1
watchdog
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
xen
Two fixes for regressions:
2012-04-06 17:54:53 -07:00
zorro
Kconfig
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Makefile
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00