]> 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)
commit6b15a8d4491b4b583627c0aca0ba3f31eb8710f1
tree4fc63e45729fe4cba491c9a7abc9d9e9f72372f2
parent0150e3ae2139f1077ebe06434e968938251d2a42
parente9c23ec6048006b6593f54ccb1519d4f76359496
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 (68ebd3d01cb9 and
db48987a6971) 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