| commit | a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9 | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@qca.qualcomm.com> | Fri Jan 13 13:57:45 2012 +0200 |
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | Fri Jan 13 13:57:45 2012 +0200 |
| tree | 12d6c61b17e3b3b9874b9a0d1063e711af483b02 | |
| parent | e80ec84d9352419a7c0482edfbf1b96eaa4c8b95 [diff] | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 [diff] |
Merge remote branch 'wireless-next/master' into ath6kl-next Conflicts: drivers/net/wireless/ath/ath6kl/usb.c