1. 16 5月, 2008 2 次提交
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 8568dae2
      Linus Torvalds 提交于
      * '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.
      8568dae2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · 713c0515
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
        arch/parisc/kernel/perf_asm.S: build fix
        parisc: remove -traditional from assembler flags
        parisc: use conditional macro for 64-bit wide ops
        parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
        arch/parisc/kernel/unaligned.c: use time_* macros
        parisc: remove redundant display of free swap space in show_mem()
        drivers/parisc: replace remaining __FUNCTION__ occurrences
        parisc: replace remaining __FUNCTION__ occurrences
        parisc: new termios definitions
        parisc: fix trivial section name warnings
      713c0515
  2. 15 5月, 2008 38 次提交