1. 29 Jan, 2009 36 commits
  2. 28 Jan, 2009 4 commits
    • Linus Torvalds's avatar
      Linux 2.6.29-rc3 · 18e352e4
      Linus Torvalds authored
      18e352e4
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · c4568d6c
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code
        powerpc/pseries: Correct VIO bus accounting problem in CMO env.
        powerpc: More printing warning fixes for the l64 to ll64 conversion
        powerpc: Remove arch/ppc cruft from Kconfig
        powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
        powerpc/embedded6xx: Update defconfigs
        powerpc/8xx: Update defconfigs
        powerpc/86xx: Update defconfigs
        powerpc/83xx: Update defconfigs
        powerpc/85xx: Update defconfigs
        powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed
        powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
        powerpc/44x: Update PowerPC 44x defconfigs
        powerpc/40x: Update PowerPC 40x defconfigs
        powerpc/85xx: Fix typo in mpc8572ds dts
        powerpc/44x: Warp patches for the new NDFC driver
        powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info
      c4568d6c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 78a768b6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: fix 5329 ColdFire periphal addressing
        uclinux: add process name to allocation error message
        m68knommu: correct the mii calculations for 532x ColdFire FEC
        m68knommu: add ColdFire M532x to the FEC configuration options
        m68knommu: fix syscall restarting
        m68knommu: remove the obsolete and long unused comempci chip support
        m68knommu: remove the no longer used PCI support option
        m68knommu: remove obsolete and unused eLIA board
        m68knommu: set NO_DMA
        m68knommu: fix cache flushing for the 527x ColdFire processors
        m68knommu: fix ColdFire 5272 serial baud rates in mcf.c
        m68knommu: use one exist from execption
      78a768b6
    • Kumar Gala's avatar
      dmi: Fix build breakage · d8204ee2
      Kumar Gala authored
      Commit d7b1956f ("DMI: Introduce
      dmi_first_match to make the interface more flexible") introduced compile
      errors like the following when !CONFIG_DMI
      
          drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
          drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
          drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast
      
      We just need a dummy version of dmi_first_match() to fix this all up.
      Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d8204ee2