1. 20 Jun, 2009 3 commits
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 773d7a09
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits)
        powerpc/5121: make clock debug output more readable
        powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function
        powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft
        powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback
        fbdev/xilinxfb: Fix improper casting and tighen up probe path
        usb/ps3: Add missing annotations
        powerpc: Add memory clobber to mtspr()
        powerpc: Fix invalid construct in our CPU selection Kconfig
        ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
        powerpc: Add configurable -Werror for arch/powerpc
        of_serial: Add UPF_FIXED_TYPE flag
        drivers/hvc: Add missing __devexit_p()
        net/ps3: gelic - Add missing annotations
        powerpc: Introduce macro spin_event_timeout()
        powerpc/warp: Fix ISA_DMA_THRESHOLD default
        powerpc/bootwrapper: Custom build options for XPedite52xx targets
        powerpc/85xx: Add defconfig for X-ES MPC85xx boards
        powerpc/85xx: Add dts files for X-ES MPC85xx boards
        powerpc/85xx: Add platform support for X-ES MPC85xx boards
        83xx: add support for the kmeter1 board.
        ...
      773d7a09
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 17fad520
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: convert page/tlb to asm-generic
        Blackfin: convert types to asm-generic
        Blackfin: convert irq/process to asm-generic
        Blackfin: convert signal/mmap to asm-generic
        Blackfin: convert locking primitives to asm-generic
        Blackfin: convert termios to asm-generic
        Blackfin: convert simple headers to asm-generic
        Blackfin: convert socket/poll to asm-generic
        Blackfin: convert user/elf to asm-generic
        Blackfin: convert shm/sysv/ipc to asm-generic
        Blackfin: convert asm/ioctls.h to asm-generic/ioctls.h
        Blackfin: only build irqpanic.c when needed
        Blackfin: pull in asm/io.h in ksyms for prototypes
        Blackfin: use common test_bit() rather than __test_bit()
      17fad520
  2. 19 Jun, 2009 37 commits