tree 08cb1916a8de38f5b4e3a72973f7694df218d98c
parent e56108d92760c89ce21c30aa02588595b9396251
parent e1b69fdf33f63cfa600b992172d7376f9d9ef2e9
author John W. Linville <linville@tuxdriver.com> 1353353892 -0500
committer John W. Linville <linville@tuxdriver.com> 1353353892 -0500

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes