Merge remote-tracking branch 'wireless-next/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Fri, 11 Oct 2013 07:57:47 +0000 (09:57 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 11 Oct 2013 07:57:47 +0000 (09:57 +0200)
commit04a4e1fdd248d7a19d53e6e90f757e99093e3d29
treeae16ad3f90d9dd726838077aae74675ba7ae51fc
parent19e737c98479f040e23987e50596a861e5e88b92
parente25aa82a89db9e3b09d02b5481aa375c7712a10d
Merge remote-tracking branch 'wireless-next/master' into HEAD
drivers/net/wireless/iwlwifi/pcie/trans.c