From: Linus Torvalds Date: Tue, 17 May 2016 01:55:43 +0000 (-0700) Subject: Merge tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi X-Git-Tag: v4.7-rc1~175 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=27d6cafa7e10ca0f97b57ea4da2d8a73e41d6e65;p=linux.git Merge tag 'for-linus-4.7' of git://git.code.sf.net/p/openipmi/linux-ipmi 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 --- 27d6cafa7e10ca0f97b57ea4da2d8a73e41d6e65