Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 16:22:24 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Apr 2009 16:22:24 +0000 (09:22 -0700)
commit32527bc0e4b4fa7711ad1c923cf64ae72a7ffd9d
tree397c7ea179ebd3d2dacc0a2c8b165f8840137045
parente14a685dfabf3ceeb366f1db1a22471b8f98a08b
parent99f6a570eedc885675b6aa36b7acdbdcc3a7f55b
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] cio: online_store - trigger recognition for boxed devices
  [S390] cio: disallow online setting of device in transient state
  [S390] cio: introduce notifier for boxed state
  [S390] cio: introduce ccw_device_schedule_sch_unregister
  [S390] cio: wake up on failed recognition
  [S390] fix hypfs build failure
  [PATCH] sysrq: include interrupt.h instead of irq.h
drivers/char/sysrq.c