amend "ath9k: Allow platform override without EEPROM override"
authorHelmut Schaa <helmut.schaa@googlemail.com>
Thu, 8 May 2014 11:48:38 +0000 (13:48 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 13 May 2014 19:56:33 +0000 (15:56 -0400)
Originally Helmut posted a v2 of the "ath9k: Allow platform override
without EEPROM override", but I had prematurely commited the original
as commit 552a515707a.  This commit restores the tree to what Helmut
intended with his v2 submission. -- JWL

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

Simple merge