| commit | 59ef43e681d103a51c3727dad0315e093f07ec61 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Apr 18 14:17:13 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Apr 18 14:27:48 2012 -0400 |
| tree | 87f6320f1440ce3ce6c0c15ad3cef8bc98186f88 | |
| parent | 91fbe33034c184c6a60e31c2207a2f7ec2f180dc [diff] | |
| parent | b5abcf0219263f4e961dca71cbe26e06c5b0ee68 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-testmode.c include/net/nfc/nfc.h net/nfc/netlink.c net/wireless/nl80211.c