| commit | 36099365c7cc64e5184b66b6eb094950a13f540c | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Fri Jun 24 15:25:51 2011 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Jun 24 15:25:51 2011 -0400 |
| tree | c91b9f3719f94864a62f2d15a71aaecd54c56711 | |
| parent | 22c8c9343258feda9ea9ebb9e5f8cbb727b69454 [diff] | |
| parent | f70490e6078abe1182437e629f67a7f0b6f08cd4 [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/rtlwifi/pci.c include/linux/netlink.h