Sujith Manoharan
57527f8d4d
ath9k_hw: Program filter coefficients correctly ...
2484 Mhz (Japan) usage requires filter coefficients to
be programmed in the CCK TX FIR registers. This is required
for AR9331, AR9485 and AR9462. Fix this and also remove
a few useless macros and a duplicate variable.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2012-11-16 14:29:11 -05:00
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
Merge branch 'samsung_platform_data' into staging/for_v3.7
2012-10-05 22:32:05 -03:00
sections: fix section conflicts in drivers/atm
2012-10-06 03:04:40 +09:00
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
bcma: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
2012-10-29 15:19:31 -04:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2012-10-19 15:22:27 -04:00
drivers: bus: omap_l3: fixup merge conflict resolution
2012-10-01 19:39:48 -07:00
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
2012-10-11 18:41:29 +08:00
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
2012-10-08 14:58:56 -07:00
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
2012-10-08 22:52:54 -04:00
ARM: soc: late platform updates
2012-10-07 20:55:16 +09:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
2012-10-09 18:26:28 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-10-09 16:08:04 +09:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
Merge branch 'next' into for-linus
2012-10-11 00:45:21 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +09:00
sections: fix section conflicts in drivers/ide
2012-10-06 03:04:41 +09:00
intel_idle: enable IVB Xeon support
2012-09-26 22:28:21 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-13 10:56:03 +09:00
IOMMU Updates for Linux v3.7-rc1
2012-10-08 06:33:44 +09:00
irqchip: fill in empty Kconfig
2012-09-24 10:07:40 -07:00
isdn: fix a wrapping bug in isdn_ppp_ioctl()
2012-10-10 22:50:45 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
md updates for 3.7
2012-10-13 13:22:01 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-10-12 12:39:17 +09:00
memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl()
2012-09-26 14:04:09 -07:00
1. New drivers:
2012-10-07 17:29:24 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
mmc: mxs-mmc: Fix merge issue causing build error
2012-10-11 17:21:40 -04:00
mtd: Disable mtdchar mmap on MMU systems
2012-10-09 15:08:42 +01:00
ath9k_hw: Program filter coefficients correctly
2012-11-16 14:29:11 -05:00
NFC: pn533: Remove unused arg parameter
2012-10-26 18:26:51 +02:00
Devicetree updates for 3.7
2012-10-03 09:44:08 -07:00
mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
2012-10-09 16:22:18 +09:00
Xtensa patchset for 3.7
2012-10-09 16:11:46 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-10-06 03:16:12 +09:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
pinctrl/nomadik: use simple or linear IRQ domain
2012-10-10 08:57:26 +02:00
Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
2012-10-09 01:47:35 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
rapidio: update for destination ID allocation
2012-10-11 08:50:15 +09:00
MFD bits for the 3.7 merge window.
2012-10-05 12:01:30 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
2012-10-07 21:04:56 +09:00
rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
2012-10-11 08:50:16 +09:00
s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c
2012-10-09 14:17:00 +02:00
SCSI misc on 20121012
2012-10-13 10:57:01 +09:00
ARM: soc: multiplatform enablement
2012-10-01 19:11:38 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
ssb: handle BCM43222 in pmu code.
2012-10-29 15:30:37 -04:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block
2012-10-11 09:04:23 +09:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal
2012-10-09 01:35:52 -04:00
KGDB/KDB fixes and cleanups
2012-10-13 11:16:58 +09:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
2012-10-11 15:18:49 -04:00
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-10-10 19:52:19 +09:00
fbdev updates for 3.7
2012-10-12 10:21:02 +09:00
virtio_mmio: Don't attempt to create empty virtqueues
2012-09-28 15:05:16 +09:30
char/misc driver merge for 3.7-rc1
2012-10-01 12:09:59 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
2012-10-07 21:06:10 +09:00
Feature:
2012-10-12 22:20:28 +09:00
ARM: soc: driver specific changes
2012-10-01 18:46:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
57527f8d4d