Merge remote-tracking branch 'wireless-next/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)
diff --cc drivers/net/wireless/iwlegacy/3945-mac.c
Simple merge
diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge
diff --cc net/wireless/core.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 02:48:41 +0000 (12:48 +1000)
		1	2
drivers/net/wireless/iwlegacy/3945-mac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-mac.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	patch \|	diff1 \|	diff2 \|	blob \| history