diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-18 07:30:25 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-18 07:30:25 -0700 |
| commit | cef09b808e584c13b7126b83dc37c80b00234137 (patch) | |
| tree | b345706247e3695b2288e62c78c08225b7feec1c /net/mac80211/ht.c | |
| parent | 6e2d98dc1af49a6736cd9c54e2e44b5d5234d242 (diff) | |
| parent | 765ee51f9a3f652959b4c7297d198a28e37952b4 (diff) | |
Merge branch 'eisa' into next
* eisa:
Revert "EISA: Initialize device before its resources"
Revert "EISA: Log device resources in dmesg"
Diffstat (limited to 'net/mac80211/ht.c')
0 files changed, 0 insertions, 0 deletions