Bing Zhao
428ca8a706
mwifiex: update pcie8766 scratch register addresses ...
The scratch register addresses have been changed for newer chips.
Since the old chip was never shipped and it will not be supported
any more, just update register addresses to support the new chips.
Cc: <stable@vger.kernel.org> # 3.2.y, 3.3.y
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2012-04-13 14:06:59 -04:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
1) AHCI regression fix. A recent "make driver conform to spec" change
2012-03-22 20:22:30 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
bcma: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
2012-03-30 08:50:27 +02:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
2012-04-05 17:34:30 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-03-22 18:15:32 -07:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
MCE, AMD: Drop too granulary family model checks
2012-04-04 15:50:11 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gpio: tegra: Iterate over the correct number of banks
2012-04-04 13:13:18 -06:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
hwmon: (ad7314) Adds missing spi_dev initialization
2012-04-03 17:08:28 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-29 23:17:44 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-02 17:53:39 -07:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
md/raid1,raid10: don't compare excess byte during consistency check.
2012-04-03 15:39:23 +10:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
mwifiex: update pcie8766 scratch register addresses
2012-04-13 14:06:59 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ASPM: Fix pcie devices with non-pcie children
2012-03-31 12:49:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-03-22 12:38:04 -07:00
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2012-03-23 14:46:48 -04:00
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
428ca8a706