| commit | 78d12c237ca2e32ac6570b161d2137b5288c5511 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jan 31 15:24:31 2011 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jan 31 15:24:31 2011 -0500 |
| tree | 673c6ecfc34c7534503be739e0be777ee6422424 | |
| parent | 7c3ee9e3fd065e878a2dbaec9d417441c59799be [diff] | |
| parent | b955fba29b2082bba8cb94a959a8ec0a375aec8f [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/wl12xx/spi.c