David S. Miller aef4f5b6db Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ... Conflicts: net/6lowpan/iphc.c Minor conflicts in iphc.c were changes overlapping with some style cleanups. John W. Linville says: ==================== Please pull this last(?) batch of wireless change intended for the 3.17 stream... For the NFC bits, Samuel says: "This is a rather quiet one, we have: - A new driver from ST Microelectronics for their NCI ST21NFCB, including device tree support. - p2p support for the ST21NFCA driver - A few fixes an enhancements for the NFC digital laye" For the Atheros bits, Kalle says: "Michal and Janusz did some important RX aggregation fixes, basically we were missing RX reordering altogether. The 10.1 firmware doesn't support Ad-Hoc mode and Michal fixed ath10k so that it doesn't advertise Ad-Hoc support with that firmware. Also he implemented a workaround for a KVM issue." For the Bluetooth bits, Gustavo and Johan say: "To quote Gustavo from his previous request: 'Some last minute fixes for -next. We have a fix for a use after free in RFCOMM, another fix to an issue with ADV_DIRECT_IND and one for ADV_IND with auto-connection handling. Last, we added support for reading the codec and MWS setting for controllers that support these features.' Additionally there are fixes to LE scanning, an update to conform to the 4.1 core specification as well as fixes for tracking the page scan state. All of these fixes are important for 3.17." And, "We've got: - 6lowpan fixes/cleanups - A couple crash fixes, one for the Marvell HCI driver and another in LE SMP. - Fix for an incorrect connected state check - Fix for the bondable requirement during pairing (an issue which had crept in because of using "pairable" when in fact the actual meaning was "bondable" (these have different meanings in Bluetooth)" Along with those are some late-breaking hardware support patches in brcmfmac and b43 as well as a stray ath9k patch. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 13:18:20 -07:00
..
accessibility	…
acpi	ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s	2014-07-16 14:16:30 +02:00
amba	…
ata	libata: introduce ata_host->n_tags to avoid oops on SAS controllers	2014-07-23 10:30:34 -04:00
atm	drivers: atm: fix %d confusingly prefixed with 0x in format strings	2014-08-05 13:04:32 -07:00
auxdisplay	…
base	platform_get_irq: Revert to platform_get_resource if of_irq_get fails	2014-07-11 18:06:36 -07:00
bcma	bcma: use NS prefix for names of Northstar specific cores	2014-07-31 13:45:32 -04:00
block	zram: avoid lockdep splat by revalidate_disk	2014-07-23 15:10:54 -07:00
bluetooth	Bluetooth: Fix crash in the Marvell driver initialization codepath	2014-07-31 01:07:28 +02:00
bus	bus/arm-cci: add dependency on OF && CPU_V7	2014-06-17 17:09:35 +02:00
cdrom	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2014-06-11 08:41:17 -07:00
char	Fix a BUG splat found by trinity.	2014-07-18 20:26:46 -10:00
clk	This batch of fixes is for a handful of clock drivers from Allwinner,	2014-07-13 12:21:04 -07:00
clocksource	clocksource: exynos_mct: Register the timer for stable udelay	2014-07-05 06:40:23 +09:00
connector	Char / misc driver patches for 3.16-rc1	2014-06-03 08:06:56 -07:00
cpufreq	cpufreq: move policy kobj to policy->cpu at resume	2014-07-17 14:23:22 +02:00
cpuidle	cpuidle: mvebu: Fix the name of the states	2014-06-18 21:54:46 +02:00
crypto	crypto: caam - fix memleak in caam_jr module	2014-07-10 16:59:13 +08:00
dca	…
devfreq	PM / devfreq: remove checks for CONFIG_EXYNOS_ASV	2014-05-24 22:33:51 +09:00
dio	…
dma	Update imx-sdma cyclic handling to report residue	2014-07-01 12:23:42 +05:30
edac	PCI changes for the v3.16 merge window:	2014-06-02 12:15:19 -07:00
eisa	…
extcon	…
firewire	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-30 13:25:49 -07:00
firmware	efi: fdt: Do not report an error during boot if UEFI is not available	2014-07-10 11:02:48 +01:00
fmc	…
gpio	Pin control fixes for v3.16:	2014-07-23 17:42:37 -07:00
gpu	drm/radeon: fix cut and paste issue for hawaii.	2014-07-25 09:17:35 +10:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2014-07-07 13:13:03 -07:00
hsi	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
hv	Drivers: hv: hv_fcopy: fix a race condition for SMP guest	2014-07-17 18:43:10 -07:00
hwmon	hwmon: (smsc47m192) Fix temperature limit and vrm write operations	2014-07-24 06:25:25 -07:00
hwspinlock	…
i2c	i2c: sun6i-p2wi: Remove duplicate inclusion of module.h	2014-06-27 14:39:36 +02:00
ide	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide	2014-07-21 22:44:24 -07:00
idle	…
iio	iio: mma8452: Use correct acceleration units.	2014-07-12 13:18:55 +01:00
infiniband	mlx5: Adjust events to use unsigned long param instead of void *	2014-07-30 14:00:06 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2014-07-23 15:42:53 -07:00
iommu	iommu/fsl: Fix the error condition during iommu group	2014-07-07 10:30:02 +02:00
ipack	…
irqchip	irqchip: gic: Fix core ID calculation when topology is read from DT	2014-07-18 13:13:41 +00:00
isdn	net: filter: split 'struct sk_filter' into socket and bpf parts	2014-08-02 15:03:58 -07:00
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2014-06-12 13:08:09 -07:00
lguest	…
macintosh	powerpc/macintosh/smu.c: Fix closing brace followed by if	2014-06-24 12:43:15 +10:00
mailbox	…
mcb	mcb: Add support for shared PCI IRQs	2014-05-27 17:38:11 -07:00
md	Fix the dm-thinp and dm-cache targets to disallow changing the data	2014-07-18 06:25:05 -10:00
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
memory	…
memstick	drivers/memstick/host/rtsx_pci_ms.c: add cancel_work when remove driver	2014-06-23 16:47:44 -07:00
message	mptfusion: fix msgContext in mptctl_hp_hostinfo	2014-05-28 18:14:16 +02:00
mfd	mfd: ab8500: Fix dt irq mapping	2014-06-26 13:34:15 +01:00
misc	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
mmc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-06-12 14:27:40 -07:00
mtd	Two UBI fastmap-related fixes for v3.16:	2014-07-18 06:23:34 -10:00
net	Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-08-05 13:18:20 -07:00
nfc	NFC: st21nfca: Adding P2P support to st21nfca in Initiator & Target mode	2014-07-23 01:14:41 +02:00
ntb	…
nubus	kernel/printk: use symbolic defines for console loglevels	2014-06-04 16:54:17 -07:00
of	of: Add memory limiting function for flattened devicetrees	2014-07-29 21:26:45 -06:00
oprofile	…
parisc	…
parport	parport: fix menu breakage	2014-07-25 18:00:23 -07:00
pci	PCI: Fix unaligned access in AF transaction pending test	2014-06-17 15:40:13 -06:00
pcmcia	pcmcia: Use pci_is_bridge() to simplify code	2014-05-27 14:58:24 -06:00
phy	USB fixes for 3.16-rc5	2014-07-12 14:13:10 -07:00
pinctrl	pinctrl: st: Fix irqmux handler	2014-07-15 20:55:15 +02:00
platform	Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86	2014-06-10 16:58:32 -07:00
pnp	Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'	2014-06-03 23:13:00 +02:00
power	ACPI and power management updates for 3.16-rc1	2014-06-04 08:57:16 -07:00
powercap	…
pps	…
ps3	…
ptp	ptp: Allow reassigning calibration pin function	2014-07-01 18:52:54 -07:00
pwm	pwm: Changes for v3.16-rc1	2014-06-11 14:06:55 -07:00
rapidio	rapidio/tsi721: use pci_enable_msix_exact() instead of pci_enable_msix()	2014-06-06 16:08:13 -07:00
regulator	Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/palmas' and 'regulator/fix/tps65218' into regulator-linus	2014-06-28 14:01:04 +01:00
remoteproc	remoteproc: da8xx: don't select CMA on no-MMU	2014-06-17 17:09:36 +02:00
reset	ARM: SoC driver changes	2014-06-02 16:35:49 -07:00
rpmsg	…
rtc	drivers/rtc/rtc-puv3.c: remove "&dev->" for typo issue MIME-Version: 1.0	2014-06-20 08:22:39 +08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
sbus	…
scsi	cxgb4i : remove spurious use of rcu	2014-08-02 20:34:33 -07:00
sfi	…
sh	SH Driver Update for v3.16	2014-06-06 11:44:09 -07:00
sn	…
soc	soc: qcom: fix of_device_id table	2014-05-26 21:27:09 +02:00
spi	Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/qup' and 'spi/fix/sh-sci' into spi-linus	2014-06-28 14:01:23 +01:00
spmi	…
ssb	ssb: extract power info from SPROM revs 4 and 5	2014-07-18 13:45:24 -04:00
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
target	iscsi-target: fix iscsit_del_np deadlock on unload	2014-06-27 23:23:35 -07:00
tc	TC: Handle device_register() errors.	2014-06-26 10:48:23 +01:00
thermal	thermal: ti-soc-thermal: ti-bandgap.c: Cleaning up wrong address is checked	2014-07-01 09:52:35 +08:00
tty	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-16 14:09:34 -07:00
uio	Revert "uio: fix vma io range check in mmap"	2014-06-17 16:07:08 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-07-22 00:44:59 -07:00
uwb	uwb: fix variable set but not used warnings	2014-05-27 15:18:48 -07:00
vfio	A handful of VFIO bug fixes for v3.16	2014-06-07 20:12:15 -07:00
vhost	vhost-scsi: don't open-code kvfree	2014-06-23 09:22:48 +03:00
video	fb: adv7393: add missing semicolon	2014-07-01 13:18:38 +03:00
virt	…
virtio	…
vlynq	…
vme	…
w1	w1: mxc_w1: Fix incorrect "presence" status	2014-06-19 17:51:46 -07:00
watchdog	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2014-06-21 06:47:01 -10:00
xen	Fix BUG when trying to expand the grant table. This seems to occur	2014-07-30 09:00:20 -07:00
zorro	…
Kconfig	…
Makefile	Char / misc driver patches for 3.16-rc1	2014-06-03 08:06:56 -07:00