tree d18858aacd9634b71f543f6a187f313950a13432
parent 5983b125740553d08a67d0c57e8c1021f5a06e31
parent 3ecb0a5a7b567c9719d61938bcdba22938084b65
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180628197 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180628197 -0700

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: deregister ccw device when pgid disband failed
  [S390] cio: Use device_schedule_callback() for removing disconnected devices.
  [S390] Fix section annotations.
  [S390] raw3270: use mutex instead of semaphore
  [S390] arch/s390/kernel/debug.c: use mutex instead of semaphore
  [S390] dasd_eer: use mutex instead of semaphore
  [S390] Add exception handler for diagnose 224