Xie XiuQi
cc3e2af42e
memory-failure: change type of action_result's param 3 to enum ...
Change type of action_result's param 3 to enum for type consistency,
and rename mf_outcome to mf_result for clearly.
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Chen Gong <gong.chen@linux.intel.com>
Cc: Jim Davis <jim.epost@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-24 17:49:43 -07:00
Merge branch 'acpi-cca'
2015-06-19 01:17:35 +02:00
PCI changes for the v4.2 merge window:
2015-06-23 13:41:24 -07:00
crypto: rng - Do not free default RNG when it becomes unused
2015-06-22 15:49:18 +08:00
drm/radeon: add new bonaire pci id
2015-05-12 13:42:46 -04:00
mfd: arizona: Add convience defines for micd_rate/micd_bias_starttime
2015-06-22 12:25:22 +01:00
memory-failure: change type of action_result's param 3 to enum
2015-06-24 17:49:43 -07:00
Merge branch 'patchwork' into v4l_for_linus
2015-04-21 06:12:35 -03:00
cxl: Add AFU virtual PHB and kernel API
2015-06-03 13:27:20 +10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-06-22 21:04:48 -07:00
IB/mad: Add final OPA MAD processing
2015-06-12 14:49:18 -04:00
SCSI misc on 20150622
2015-06-23 15:55:44 -07:00
ALSA: hda - Re-add the lost fake mute support
2015-06-11 11:55:48 +02:00
SCSI misc on 20150622
2015-06-23 15:55:44 -07:00
SCSI misc on 20150622
2015-06-23 15:55:44 -07:00
The bulk of the changes here is for x86. And for once it's not
2015-06-24 09:36:49 -07:00
video: fbdev: tdfxfb: use arch_phys_wc_add() and ioremap_wc()
2015-06-03 12:41:52 +03:00
xen/events: don't bind non-percpu VIRQs with percpu chip
2015-05-19 19:55:36 +01:00
cc3e2af42e