summaryrefslogtreecommitdiffstats
path: root/drivers/char/ipmi/ipmi_ssif.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-05 18:52:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-05 18:52:13 -0700
commit2a171aa21afcd43f6cee574154d8c8db905351e5 (patch)
tree4dbf5b0927c3337dd706cdc9d3c050e072005f53 /drivers/char/ipmi/ipmi_ssif.c
parent3ce05a4e740539a3e9d48456e2b046b7240df3ff (diff)
parent489405fe5ed38e65f6f82f131a39c67f3bae6045 (diff)
downloadlinux-2a171aa21afcd43f6cee574154d8c8db905351e5.tar.bz2
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton: "16 patches This includes a new rtc driver for the Abracon AB x80x and isn't very appropriate for -rc2. It was still being fiddled with a bit during the merge window and I fell asleep during -rc1" [ So I took the new driver, it seems small and won't regress anything. I'm a softy. - Linus ] * emailed patches from Andrew Morton <akpm@linux-foundation.org>: rtc: armada38x: fix concurrency access in armada38x_rtc_set_time ocfs2: dlm: fix race between purge and get lock resource nilfs2: fix sanity check of btree level in nilfs_btree_root_broken() util_macros.h: have array pointer point to array of constants configfs: init configfs module earlier at boot time mm/hwpoison-inject: check PageLRU of hpage mm/hwpoison-inject: fix refcounting in no-injection case mm: soft-offline: fix num_poisoned_pages counting on concurrent events rtc: add rtc-abx80x, a driver for the Abracon AB x80x i2c rtc Documentation: bindings: add abracon,abx80x kasan: show gcc version requirements in Kconfig and Documentation mm/memory-failure: call shake_page() when error hits thp tail page lib: delete lib/find_last_bit.c MAINTAINERS: add co-maintainer for LED subsystem zram: add Designated Reviewer for zram in MAINTAINERS revert "zram: move compact_store() to sysfs functions area"
Diffstat (limited to 'drivers/char/ipmi/ipmi_ssif.c')
0 files changed, 0 insertions, 0 deletions