Merge v3.0.59 Conflicts: Makefile drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h drivers/net/wireless/ath/ath9k/ar9003_eeprom.h drivers/usb/serial/option.c