| commit | a70171dce9cd44cb06c7d299eba9fa87a8933045 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Thu May 05 13:32:35 2011 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Thu May 05 13:32:35 2011 -0400 |
| tree | 5425df5f33fadc617c7dec99578d06f0d933578e | |
| parent | 5a412ad7f4c95bb5b756aa12b52646e857e7c75d [diff] | |
| parent | eaef6a93bd52a2cc47b9fce201310010707afdb4 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/libertas/if_cs.c drivers/net/wireless/rtlwifi/pci.c net/bluetooth/l2cap_sock.c