Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:48:17 +0000 (15:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Oct 2012 19:48:17 +0000 (15:48 -0400)
commitb0a949b42ba7d6f1b2876045a5e062fdfe8c691f
treea76ed2231a207a6e3d951acc7fd749bc12173416
parent3cd17638fdf13d2f7fe76465cf74106e612af5eb
parent4e760f1ab267edcd6e4b232ff732fc9cdc659ebb
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next