From: Linus Torvalds Date: Thu, 15 May 2008 16:10:13 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8568dae21e186fbb111bbe6583033a33fe26f83d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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. --- 8568dae21e186fbb111bbe6583033a33fe26f83d