1. 08 5月, 2010 11 次提交
  2. 07 5月, 2010 25 次提交
  3. 06 5月, 2010 4 次提交
    • L
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · e8e8fade
      Linus Torvalds 提交于
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Defconfig update
        microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros
        microblaze: Fix consistent-sync code
        microblaze: Define correct L1_CACHE_SHIFT value
        microblaze: cpuinfo shows cache line length
        microblaze: Fix kmalloc alignment on non-coherent DMA platforms
        microblaze: Fix typo fault in cache code
        microblaze: Fix consistent code
        microblaze: pci-dma: use include/linux/dma-mapping.h
        microblaze: page.h: Remove get_user_page and free_user_page
        microblaze: Remove "cache" optimized copy_page function
        microblaze: invoke oom-killer from page fault
        microblaze: fix divide by zero exception message
        microblaze: Add isa_dma_bridge_buggy to dma.h
        microblaze: Remove ancient code
        microblaze: Quiet section mismatch warnings for MMU version
        microblaze: Quiet section mismatch warnings
        microblaze: Fix IRQ entry/exit ftracing
        microblaze: resource/PCI: align functions now return start of resource
        microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
      e8e8fade
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 325ce9e3
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h
        [ARM] pxa/spitz: fix On/off key name to fix warning during boot
        [ARM] pxa: fix the incorrect cpu_is_pxa950()
        [ARM] pxa: update cpuid pattern for pxa9xx in head.S
        [ARM] pxa/viper: fix timeout usage for I2C
        [ARM] pxa/raumfeld: fix button name
        [ARM] pxa/imote2: Fix iMote2 defconfig
        [ARM] pxa: add missing new line to regs-u2d.h
        ARM: 6093/1: Fix kernel memory printing for sparsemem
        arch/arm/include/asm/elf.h: forward-declare the task-struct
        arch/arm/plat-pxa/dma.c: correct NULL test
        ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver
        ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600
        ARM: Update mach-types
        ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002
        ARM: 6068/1: Fix build break with KPROBES enabled
        mx5: Fix build error for mx51_defconfig
      325ce9e3
    • L
      Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · bbfdbe9d
      Linus Torvalds 提交于
      * 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
        sh: fix a number of Oopses and leaks in SH framebuffer driver
        SH: fix error paths in DMA driver
        sh: sh7751 pci controller io port fix
        sh: Fix maximum number of SCIF ports in R2D defconfigs
        SH: fix TS field shift calculation for DMA drivers
      bbfdbe9d
    • M
      microblaze: Defconfig update · 65134121
      Michal Simek 提交于
      Signed-off-by: NMichal Simek <monstr@monstr.eu>
      65134121