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

diff --combined drivers/char/sysrq.c
index 5afe7316c72ed0ab82c96bc9a007ec60fcb2b0a9,3df694e545454228ee8b47e1a3b3dc4e61f9c43b..ebea9b2c30a583737a0e7800122217ff4eaf273c
--- 1/drivers/char/sysrq.c
--- 2/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@@ -35,7 -35,7 +35,7 @@@
  #include <linux/vt_kern.h>
  #include <linux/workqueue.h>
  #include <linux/kexec.h>
- #include <linux/irq.h>
+ #include <linux/interrupt.h>
  #include <linux/hrtimer.h>
  #include <linux/oom.h>
  
@@@ -346,19 -346,6 +346,19 @@@ static struct sysrq_key_op sysrq_moom_o
        .enable_mask    = SYSRQ_ENABLE_SIGNAL,
  };
  
 +#ifdef CONFIG_BLOCK
 +static void sysrq_handle_thaw(int key, struct tty_struct *tty)
 +{
 +      emergency_thaw_all();
 +}
 +static struct sysrq_key_op sysrq_thaw_op = {
 +      .handler        = sysrq_handle_thaw,
 +      .help_msg       = "thaw-filesystems(J)",
 +      .action_msg     = "Emergency Thaw of all frozen filesystems",
 +      .enable_mask    = SYSRQ_ENABLE_SIGNAL,
 +};
 +#endif
 +
  static void sysrq_handle_kill(int key, struct tty_struct *tty)
  {
        send_sig_all(SIGKILL);
@@@ -409,13 -396,9 +409,13 @@@ static struct sysrq_key_op *sysrq_key_t
        &sysrq_moom_op,                 /* f */
        /* g: May be registered by ppc for kgdb */
        NULL,                           /* g */
 -      NULL,                           /* h */
 +      NULL,                           /* h - reserved for help */
        &sysrq_kill_op,                 /* i */
 +#ifdef CONFIG_BLOCK
 +      &sysrq_thaw_op,                 /* j */
 +#else
        NULL,                           /* j */
 +#endif
        &sysrq_SAK_op,                  /* k */
  #ifdef CONFIG_SMP
        &sysrq_showallcpus_op,          /* l */