tree 6d87a6d1ad2bc4672684197aa1788890bead0d1e
parent d1526e2cda64d5a1de56aef50bad9e5df14245c2
parent e42734e270b9e5ada83188d73b733533ce11ee4a
author Linus Torvalds <torvalds@woody.osdl.org> 1166206942 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1166206942 -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: css_register_subchannel race.
  [S390] Save prefix register for dump on panic
  [S390] Fix reboot hang
  [S390] Fix reboot hang on LPARs
  [S390] sclp_cpi module license.
  [S390] zcrypt: module unload fixes.
  [S390] Hipersocket multicast queue: make sure outbound handler is called
  [S390] hypfs fixes
  [S390] update default configuration