Merge tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 01:55:43 +0000 (18:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 01:55:43 +0000 (18:55 -0700)
Pull IPMI updates from Corey Minyard:
 "Some small fixes and cleanups, these latest have been in linux-next
  for a few weeks"

* tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: Fix the I2C address extraction from SPMI tables
  IPMI: reserve memio regions separately
  ipmi: Fix some minor coding style issues


Trivial merge