| commit | 694d82d913d18c6c6872b0dc93294fdf9c245667 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 14:41:35 2014 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Feb 24 14:41:35 2014 -0500 |
| tree | 3b5ea01c9cb03f6c988ff09122a4b38d8243ee84 | |
| parent | b3050248c167871ca52cfdb2ce78aa2460249346 [diff] | |
| parent | ec6f678c74dbdb06a6a775bbb00f1d26c17c404b [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes