| commit | 1032c736e81cdf490ae62f86da7efe67c3c3e61d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu Jan 05 10:12:45 2012 -0500 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu Jan 05 10:13:24 2012 -0500 |
| tree | a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73 | |
| parent | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 [diff] | |
| parent | cb00ec382b57d35b955c085198cd54a0c1fcdc94 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/b43legacy/dma.c