16c1
parent b0302aba812bcc39291cdab9ad7e37008f352a91
author John W. Linville <linville@tuxdriver.com> 1328556399 -0500
committer John W. Linville <linville@tuxdriver.com> 1328556399 -0500

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

Conflicts:
	drivers/net/wireless/rtlwifi/rtl8192se/sw.c
^/�R�