| commit | 1698c6db420bc131d4b34bc39913ee817aa47312 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jan 30 14:23:08 2013 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jan 30 14:23:08 2013 -0500 |
| tree | 8aeb9e25bba5d4cc3a893827d30913d83ea32fdf | |
| parent | 20fb9e50338199d9e88512703af4c560ab53bad4 [diff] | |
| parent | d13f1862c0ad892eded4cdf633ab32bc993cc1d9 [diff] |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next