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)
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


Trivial merge