Commit d987dd13 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote branch 'wireless-next/master' into ath6kl-next 

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c
parents c85251f8 211c17aa

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -113,3 +113,5 @@ Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> 
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer 
D: Author of the longest-living linux bug



N: Jonathan Woithe

E: jwoithe@physics.adelaide.edu.au

W: http://www.physics.adelaide.edu.au/~jwoithe

E: jwoithe@just42.net

W: http:/www.just42.net/jwoithe

D: ALS-007 sound card extensions to Sound Blaster driver

S: 20 Jordan St

S: Valley View, SA 5093

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ m68k/ 
	- directory with info about Linux on Motorola 68k architecture.

magic-number.txt

	- list of magic numbers used to mark/protect kernel data structures.

mca.txt

	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.

md.txt

	- info on boot arguments for the multiple devices driver.

memory-barriers.txt

Documentation/ABI/removed/ip_queue

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		ip_queue

Date:		finally removed in kernel v3.5.0

Contact:	Pablo Neira Ayuso <pablo@netfilter.org>

Description:

	ip_queue has been replaced by nfnetlink_queue which provides

	more advanced queueing mechanism to user-space. The ip_queue

	module was already announced to become obsolete years ago.



Users:

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+8 −8
Original line number Diff line number Diff line 
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -12,8 +12,8 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities

What:		/sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -27,7 +27,7 @@ Description: 
		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

What:		/sys/bus/usb/drivers/usbtmc/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -40,7 +40,7 @@ Description: 
		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

What:		/sys/bus/usb/drivers/usbtmc/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:
@@ -51,11 +51,11 @@ Description: 
		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

What:		/sys/bus/usb/drivers/usbtmc/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

		This file determines if the the transaction of the USB TMC

		This file determines if the transaction of the USB TMC

		device is to be automatically aborted if there is any error.

		For more details about this, please see the document,

		"Universal Serial Bus Test and Measurement Class Specification