Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

author John W. Linville <[email protected]>

Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)

committer John W. Linville <[email protected]>

Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)
author John W. Linville <[email protected]>
Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)
committer John W. Linville <[email protected]>
Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)
diff --cc drivers/net/wireless/ath/ath6kl/debug.c
Simple merge
author	John W. Linville <[email protected]>
	Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)
committer	John W. Linville <[email protected]>
	Wed, 16 May 2012 14:57:32 +0000 (10:57 -0400)