Larry Finger
e081685c1b
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices ...
MMIO log traces obtained using the Broadcom wl hybrid driver show that
the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared
if non-zero. Similar code found in other drivers such as ipw2100 show
this operation is needed to keep PCI Tx retries from interfering with
C3 CPU state. There are no known cases where omission of this code has
caused a problem, but this patch is offered just in case such a situation
occurs.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-11-15 13:23:28 -05:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-10-26 17:28:37 -07:00
ATA: pata_octeon_cf: Use I/O clock rate for timing calculations.
2010-10-29 19:08:41 +01:00
drivers/atm/eni.c: Remove multiple uses of KERN_<level>
2010-10-26 11:35:37 -07:00
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
2010-10-29 15:09:56 -07:00
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-10-28 17:11:17 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
cdrom: gdrom: ctrl_in/outX to __raw_read/writeX conversion.
2010-10-27 14:33:39 +09:00
audit: Call tty_audit_push_task() outside preempt disabled
2010-10-30 08:45:25 -04:00
connector: remove lazy workqueue creation
2010-10-24 14:20:01 -07:00
replace nested max/min macros with {max,min}3 macro
2010-10-26 16:52:12 -07:00
drivers/dma/Kconfig: add part number for Topcliff.
2010-10-29 14:14:02 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core
2010-10-26 10:13:48 -07:00
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-10-25 08:05:29 -07:00
dmi: log board, system, and BIOS information
2010-10-27 18:03:05 -07:00
gpio: Add VIA VX855 GPIO driver
2010-10-29 00:29:51 +02:00
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2010-10-27 20:37:06 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-10-25 07:59:01 -07:00
hwmon: (it87) Add support for the IT8721F/IT8758E
2010-10-28 20:31:51 +02:00
i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers
2010-10-31 21:07:00 +01:00
ide: clean up timed out request handling
2010-10-26 10:17:30 -07:00
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
2010-10-26 17:28:07 -07:00
convert get_sb_single() users
2010-10-29 04:16:28 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-10-31 21:02:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-30 18:42:58 -07:00
leds: Remove auto blink in 88pm860x
2010-10-29 00:29:44 +02:00
Move ams driver to macintosh
2010-10-28 20:31:50 +02:00
md: tidy up device searches in read_balance.
2010-10-29 16:40:33 +11:00
Input: ir-keytable - fix uninitialized variable warning
2010-10-31 21:05:43 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-10-22 17:34:15 -07:00
mfd: Fix a memory leak when unload mc13xxx-core module
2010-10-29 00:30:43 +02:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb
2010-10-29 11:49:38 -07:00
mfd: Adding twl6030 mmc card detect support for MMC1
2010-10-29 00:29:59 +02:00
Merge git://git.infradead.org/mtd-2.6
2010-10-30 08:31:35 -07:00
ath5k: make ath5k_update_bssid_mask_and_opmode() static
2010-11-15 13:23:19 -05:00
Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2010-10-30 11:43:26 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
2010-10-28 09:24:14 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
2010-10-28 17:11:17 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Remove duplicate includes from many files
2010-10-27 18:03:18 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2010-10-26 17:28:37 -07:00
power: Revert "power_supply: Mark twl4030_charger as broken"
2010-10-29 00:30:44 +02:00
rapidio: fix destructive port EM initialization for Tsi568
2010-10-27 18:03:16 -07:00
regulator: max8998 BUCK1/2 voltage change with use of GPIOs
2010-10-29 00:30:15 +02:00
rtc: Add support for the rtc found in the MC13892 PMIC
2010-10-29 00:30:01 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-10-31 20:43:12 -04:00
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-10-25 08:19:14 -07:00
[SCSI] pmcraid: add support for set timestamp command and other fixes
2010-10-29 12:03:01 -05:00
Merge branch 'for-linus' of git://www.jni.nu/cris
2010-11-01 07:53:19 -04:00
sh: intc: switch irq_desc iteration to new active IRQ iterator.
2010-10-28 11:36:31 +09:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2010-11-01 07:50:43 -04:00
ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices
2010-11-15 13:23:28 -05:00
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
2010-10-31 21:03:23 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-29 14:17:12 -07:00
uwb: Remove the WLP subsystem and drivers
2010-10-25 14:03:45 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-10-23 11:47:02 -07:00
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
2010-10-30 08:26:25 -07:00
w1: don't allow arbitrary users to remove w1 devices
2010-10-27 18:03:17 -07:00
WATCHDOG: octeon-wdt: Use I/O clock rate for timing calculations.
2010-10-29 19:08:42 +01:00
convert get_sb_single() users
2010-10-29 04:16:28 -04:00
Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
2010-10-25 08:05:29 -07:00
e081685c1b