commit | 32527bc0e4b4fa7711ad1c923cf64ae72a7ffd9d | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 01 09:22:24 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Apr 01 09:22:24 2009 -0700 |
tree | 397c7ea179ebd3d2dacc0a2c8b165f8840137045 | |
parent | e14a685dfabf3ceeb366f1db1a22471b8f98a08b [diff] | |
parent | 99f6a570eedc885675b6aa36b7acdbdcc3a7f55b [diff] |
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