diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:51:51 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:52:07 -0400 |
| commit | ada2e35defe6c6f0a986ec8147e47726fbd0e7b1 (patch) | |
| tree | 1dad19377bc12267fba1f8cf8065feb5c00a14e5 /drivers/net/wireless/ath/ath9k/hif_usb.c | |
| parent | 602b9ba2cb0c62595fa94650f9826ee37f6c633c (diff) | |
| parent | b9b6b7ae964582ac9cf8dbad9127a4cccfd30751 (diff) | |
Merge branch 'next/cpuidle' into next/pm
No point maintaining two branches for power management
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hif_usb.c')
0 files changed, 0 insertions, 0 deletions