diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-24 00:56:23 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-24 00:56:23 +0200 |
commit | 5766e9d25f41d79a0bb99e44a4408d00236dc3c7 (patch) | |
tree | 25f3beda46187f311597ffa83217771aeb212396 /drivers/char/tpm/tpm_crb.c | |
parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
parent | ipmi: fix crash on reading version from proc after unregisted bmc (diff) | |
download | linux-5766e9d25f41d79a0bb99e44a4408d00236dc3c7.tar.xz linux-5766e9d25f41d79a0bb99e44a4408d00236dc3c7.zip |
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
Diffstat (limited to 'drivers/char/tpm/tpm_crb.c')
0 files changed, 0 insertions, 0 deletions