Merge remote-tracking branch 'wireless/master'

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

Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)

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

Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc net/mac80211/ibss.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Sep 2011 02:01:42 +0000 (12:01 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	patch \|	diff1 \|	diff2 \|	blob \| history