Commit c487606f authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

 into for-davem

Conflicts:
	net/nfc/netlink.c

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents d9f72f35 97ea6d0f

Documentation/feature-removal-schedule.txt

+0 −12
Original line number Diff line number Diff line
@@ -508,18 +508,6 @@ Who: Kees Cook <keescook@chromium.org> 


----------------------------



What:	Removing the pn544 raw driver.

When:	3.6

Why:	With the introduction of the NFC HCI and SHDL kernel layers, pn544.c

	is being replaced by pn544_hci.c which is accessible through the netlink

	and socket NFC APIs. Moreover, pn544.c is outdated and does not seem to

	work properly with the latest Android stacks.

	Having 2 drivers for the same hardware is confusing and as such we

	should only keep the one following the kernel NFC APIs.

Who:	Samuel Ortiz <sameo@linux.intel.com>



----------------------------



What:	setitimer accepts user NULL pointer (value)

When:	3.6

Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4797,6 +4797,7 @@ M: Lauro Ramos Venancio <lauro.venancio@openbossa.org> 
M:	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>

M:	Samuel Ortiz <sameo@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	linux-nfc@lists.01.org (moderated for non-subscribers)

S:	Maintained

F:	net/nfc/

F:	include/linux/nfc.h

drivers/bcma/host_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ 0, },

drivers/bcma/sprom.c

+2 −0
Original line number Diff line number Diff line
@@ -507,7 +507,9 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus) 
		/* for these chips OTP is always available */

		present = true;

		break;

	case BCMA_CHIP_ID_BCM43227:

	case BCMA_CHIP_ID_BCM43228:

	case BCMA_CHIP_ID_BCM43428:

		present = chip_status & BCMA_CC_CHIPST_43228_OTP_PRESENT;

		break;

	default:

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 
	case HCI_SCODATA_PKT:

		hdev->stat.sco_tx++;

		break;

	};

	}



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);