From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 7 Mar 2007 03:52:50 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
X-Git-Tag: firefly_0821_release~30753
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe1b4ba400193176213f95be3ea711a53518a609;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: Call cancel_halt_clear even when actl == 0.
  [S390] cio: Use path verification to check for path state.
  [S390] cio: Fix locking when calling notify function.
  [S390] Fixed handling of access register mode faults.
  [S390] dasd: Use default recovery for SNSS requests
  [S390] check_bugs() should be inline.
  [S390] tape: Compression overwrites crypto setting
  [S390] nss: disable kexec.
  [S390] reipl: move dump_prefix_page out of text section.
  [S390] smp: disable preemption in smp_call_function/smp_call_function_on
  [S390] kprobes breaks BUG_ON
---

fe1b4ba400193176213f95be3ea711a53518a609