diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-16 14:07:54 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 14:07:54 -0500 |
| commit | dfbebe14428803402293d9a8bf1efef7221d8b78 (patch) | |
| tree | cd81cb3822ef4fca5925ef3bf0775eb74e905e57 /fs | |
| parent | 0f62248501cbf5047486601d7e39d5ee36d478c2 (diff) | |
| parent | d18aa87fbfe80f33076942d11f19c9d813e835b1 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions