Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next...
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 20:17:12 +0000 (22:17 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 16 Aug 2017 20:17:12 +0000 (22:17 +0200)
commitf7c1897785c674ee0c6d76b9bff69d982131c0eb
tree4294dd44d886ce70ddab26a986405d6168e4b8e9
parentaae4e7a8bc44722fe70d58920a36916b1043195e
parentd2057bbb79aad0e0f20112edd7b6599f06101e64
Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next/cleanup

Pull "ARM: hisi fixes for 4.14" from Wei Xu:

- Fix the comment typo of the machine code "0xe51ff004"
  to avoid confusion.

* tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: Fix typo in comment