1. 09 Feb, 2007 3 commits
  2. 08 Feb, 2007 5 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2 · 5986a2ec
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2: (22 commits)
        configfs: Zero terminate data in configfs attribute writes.
        [PATCH] ocfs2 heartbeat: clean up bio submission code
        ocfs2: introduce sc->sc_send_lock to protect outbound outbound messages
        [PATCH] ocfs2: drop INET from Kconfig, not needed
        ocfs2_dlm: Add timeout to dlm join domain
        ocfs2_dlm: Silence some messages during join domain
        ocfs2_dlm: disallow a domain join if node maps mismatch
        ocfs2_dlm: Ensure correct ordering of set/clear refmap bit on lockres
        ocfs2: Binds listener to the configured ip address
        ocfs2_dlm: Calling post handler function in assert master handler
        ocfs2: Added post handler callable function in o2net message handler
        ocfs2_dlm: Cookies in locks not being printed correctly in error messages
        ocfs2_dlm: Silence a failed convert
        ocfs2_dlm: wake up sleepers on the lockres waitqueue
        ocfs2_dlm: Dlm dispatch was stopping too early
        ocfs2_dlm: Drop inflight refmap even if no locks found on the lockres
        ocfs2_dlm: Flush dlm workqueue before starting to migrate
        ocfs2_dlm: Fix migrate lockres handler queue scanning
        ocfs2_dlm: Make dlmunlock() wait for migration to complete
        ocfs2_dlm: Fixes race between migrate and dirty
        ...
      5986a2ec
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 43187902
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        Revert "Driver core: convert SPI code to use struct device"
      43187902
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 21eb4fa1
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (116 commits)
        [POWERPC] Add export of vgacon_remap_base
        [POWERPC] Remove bogus comment about page_is_ram
        [POWERPC] windfarm: don't die on suspend thread signal
        [POWERPC] Fix comment in kernel/irq.c
        [POWERPC] ppc: Fix booke watchdog initialization
        [POWERPC] PPC: Use ARRAY_SIZE macro when appropriate
        [POWERPC] Use ARRAY_SIZE macro when appropriate
        [POWERPC] Fix ppc64's writing to struct file_operations
        [POWERPC] ppc: use syslog macro for the printk log level
        [POWERPC] ppc: cs4218_tdm remove extra brace
        [POWERPC] Add mpc52xx/lite5200 PCI support
        [POWERPC] Only use H_BULK_REMOVE if the firmware supports it
        [POWERPC] Fixup error handling when emulating a floating point instruction
        [POWERPC] Enable interrupts if we are doing fp math emulation
        [POWERPC] Added kprobes support to ppc32
        [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call
        [POWERPC] Clear RI bit in MSR before restoring r13 when returning to userspace
        [POWERPC] Fix performance monitor exception
        [POWERPC] Compile fixes for arch/powerpc dcr code
        [POWERPC] Maple: use mmio nvram
        ...
      21eb4fa1
    • Linus Torvalds's avatar
      Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 · 0c0e8caf
      Linus Torvalds authored
      * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Allow for 44 bit user-tokens (or drm_file offsets)
        drm/via: Disable AGP DMA for chips with the new 3D engine.
        drm: update core memory manager from git drm tree
        drm: remove drm_ioremap and drm_ioremapfree
        i810/i830: use drm_core_ioremap instead of drm_ioremap
        drm: use vmalloc_user instead of vmalloc_32 for DRM_SHM
        via: allow for npot texture pitch alignment
        via: add some new chipsets
        via: some PCI posting flushes
      0c0e8caf
    • Linus Torvalds's avatar
      kbuild: fix space for good (take 103) · b892afd1
      Linus Torvalds authored
      
      
      Michal Ostrowski points out what the real problem was: the spaces at the
      start of the definition of the 'checker-shell' make function.
      
      Cc: Michal Ostrowski <mostrows@watson.ibm.com>
      Acked-by: default avatarDavid Miller <davem@davemloft.net>
      Acked-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
      Acked-by: default avatarOleg Verych <olecom@flower.upol.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b892afd1
  3. 07 Feb, 2007 32 commits