]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:16 +0000 (10:28 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 13 Oct 2015 08:28:43 +0000 (10:28 +0200)
commitae0a43a5975030dc0ef800ae8c121c8ead5f282f
tree69fe0acbbfeb6a348d6f4c64750d278e56b935b3
parentcd3a5b63e22cc9df344fd169c5e2faadc796c500
parent22c383aa01695b1f36ca4ee6e79d9de7800b7c38
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>