tree e60943d4703fca5a291fffc2e0b77a786b6db3f4
parent ae5dd8e346efc25a5f9cc9d01bc0915c40eb38d9
parent 2470b648e17e0216922bb78c7f05b4668402459a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1173239570 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1173239570 -0800

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/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