From: Linus Torvalds Date: Sun, 23 Oct 2016 22:56:23 +0000 (-0700) Subject: Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5766e9d25f41d79a0bb99e44a4408d00236dc3c7;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi Pull IPMI updates from Corey Minyard: "A small bug fix and a new driver for acting as an IPMI device. I was on vacation during the merge window (a long vacation) but this is a bug fix that should go in and a new driver that shouldn't hurt anything. This has been in linux-next for a month or so" * tag 'for-linus-4.9-2' of git://git.code.sf.net/p/openipmi/linux-ipmi: ipmi: fix crash on reading version from proc after unregisted bmc ipmi/bt-bmc: remove redundant return value check of platform_get_resource() ipmi/bt-bmc: add a dependency on ARCH_ASPEED ipmi: Fix ioremap error handling in bt-bmc ipmi: add an Aspeed BT IPMI BMC driver --- 5766e9d25f41d79a0bb99e44a4408d00236dc3c7