Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 May 2008 16:10:13 +0000 (09:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 May 2008 16:10:13 +0000 (09:10 -0700)
commit8568dae21e186fbb111bbe6583033a33fe26f83d
tree8c4d1b93865d24a96ced4221a18a852b0367b495
parent713c0515a555952d53956196d47dec3a3ece860a
parent8dd79cb1051723496bbdcea2247e49567cedb3ac
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
  [S390] smp: __smp_call_function_map vs cpu_online_map fix.
  [S390] tape: Use ccw_dev_id to build cdev_id.
  [S390] dasd: fix timeout handling in interrupt handler
  [S390] s390dbf: Use const char * for dbf name.
  [S390] dasd: Use const in busid functions.
  [S390] blacklist.c: removed duplicated include
  [S390] vmlogrdr: module initialization function should return negative errors
  [S390] sparsemem vmemmap: initialize memmap.
  [S390] Remove last traces of cio_msg=.
  [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.