1. 17 7月, 2008 35 次提交
  2. 16 7月, 2008 5 次提交
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 45158894
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (249 commits)
        powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES
        powerpc: Fix a build problem on ppc32 with new DMA_ATTRs
        ibm_newemac: Add MII mode support to the EMAC RGMII bridge.
        powerpc: Don't spin on sync instruction at boot time
        powerpc: Add VSX load/store alignment exception handler
        powerpc: fix giveup_vsx to save registers correctly
        powerpc: support for latencytop
        powerpc: Remove unnecessary condition when sanity-checking WIMG bits
        powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT
        powerpc: Add driver for Barrier Synchronization Register
        powerpc: mman.h export fixups
        powerpc/fsl: update crypto node definition and device tree instances
        powerpc/fsl: Refactor device bindings
        powerpc/85xx: Minor fixes for 85xxds and 8536ds board.
        powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform
        powerpc/85xx: publish of device for cds platforms
        powerpc/booke: don't reinitialize time base
        powerpc/86xx: Refactor pic init
        powerpc/CPM: Add i2c pins to dts and board setup
        cpm_uart: Support uart_wait_until_sent()
        ...
      45158894
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 89a93f2f
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits)
        [SCSI] scsi_dh: fix kconfig related build errors
        [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
        [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
        [SCSI] make struct scsi_{host,target}_type static
        [SCSI] fix locking in host use of blk_plug_device()
        [SCSI] zfcp: Cleanup external header file
        [SCSI] zfcp: Cleanup code in zfcp_erp.c
        [SCSI] zfcp: zfcp_fsf cleanup.
        [SCSI] zfcp: consolidate sysfs things into one file.
        [SCSI] zfcp: Cleanup of code in zfcp_aux.c
        [SCSI] zfcp: Cleanup of code in zfcp_scsi.c
        [SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
        [SCSI] zfcp: Small QDIO cleanups
        [SCSI] zfcp: Adapter reopen for large number of unsolicited status
        [SCSI] zfcp: Fix error checking for ELS ADISC requests
        [SCSI] zfcp: wait until adapter is finished with ERP during auto-port
        [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
        [SCSI] sg: Add target reset support
        [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
        [SCSI] sd: Move scsi_disk() accessor function to sd.h
        ...
      89a93f2f
    • L
    • S
      ftrace: ftrace.txt updates · f2d9c740
      Steven Rostedt 提交于
      This patch includes ftrace.txt updates that address (mostly) comments from
      Andrew Morton. It also includes updates that were suggested by Randy
      Dunlap, John Kacur and David Teigland.
      Signed-off-by: NSteven Rostedt <srostedt@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f2d9c740
    • B
      Merge commit 'origin/master' · 84c3d4aa
      Benjamin Herrenschmidt 提交于
      Manual merge of:
      
      	arch/powerpc/Kconfig
      	arch/powerpc/kernel/stacktrace.c
      	arch/powerpc/mm/slice.c
      	arch/ppc/kernel/smp.c
      84c3d4aa