diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-11 22:50:59 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-11 22:50:59 +0400 |
| commit | b6038961dfeed49533e43fbedd86951a16cb4d2c (patch) | |
| tree | 8df5f6b6ec01a0d53d5327bd63915902a18a4fbe /include/net/nfc/hci.h | |
| parent | 2e48686835370dfe78697839ca293d250793809d (diff) | |
| parent | b1abedada3fd0aa100723aa9b60b7e31c17945cb (diff) | |
| download | linux-b6038961dfeed49533e43fbedd86951a16cb4d2c.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts:
drivers/net/wireless/iwlwifi/iwl-eeprom.c
Diffstat (limited to 'include/net/nfc/hci.h')
0 files changed, 0 insertions, 0 deletions