Merge tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 03:38:23 +0000 (20:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 03:38:23 +0000 (20:38 -0700)
Pull clang-format updates from Miguel Ojeda:
 "Two improvements for .clang-format:

   - Set IndentWrappedFunctionNames false (Jason Gunthorpe)

   - Add MAINTAINERS entry (Miguel Ojeda)"

* tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux:
  MAINTAINERS: Add .clang-format entry
  clang-format: Set IndentWrappedFunctionNames false

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge