]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless...
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 00:09:45 +0000 (16:09 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 00:09:45 +0000 (16:09 -0800)
commit8ecc2e2f7da38087679a08e2bdbf709e64e18788
tree4fc63e45729fe4cba491c9a7abc9d9e9f72372f2
parentc2dbcb9c1bb336b4ce34212bf272a6168fe7496e
parent7b6861fe1b653382a11e87142df5f56987cd722f
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
pull-request: wireless-drivers-next 2015-01-22

now a bigger pull request for net-next. Rafal found a UTF-8 bug in
patchwork[1] and because of that two commits (3c31f8911c81 and
d158cac95277) have his name corrupted:

Acked-by: Rafa? Mi?ecki <zajec5@gmail.com>
Somehow I failed to spot that when I commited the patches. As rebasing
public git trees is bad, I thought we can live with these and decided
not to rebase. But I'll pay close attention to this in the future to
make sure that it won't happen again. Also we requested an update to
patchwork.kernel.org, the latest patchwork doesn't seem to have this
bug.

Also please note this pull request also adds one DT binding doc, but
this was reviewed in the device tree list:

 .../bindings/net/wireless/qcom,ath10k.txt          |   30 +

Please let me know if you have any issues.

[1] https://lists.ozlabs.org/pipermail/patchwork/2015-January/001261.html
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS