1. 03 Jul, 2006 35 commits
  2. 02 Jul, 2006 5 commits
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc · f82bc176
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] sdhci: remove duplicate error message
        [MMC] sdhci: force DMA on some controllers
        [MMC] sdhci: quirk for broken reset
        [MMC] sdhci: Add SDHCI controller ids
      f82bc176
    • Dominik Hackl's avatar
      [PATCH] nfs: non-procfs build fix · 4ebd9ab3
      Dominik Hackl authored
      This fixes a bug in fs/nfs which makes it impossible to build nfs
      without having procfs enabled.
      Signed-off-by: default avatarDominik Hackl <dominik@hackl.dhs.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4ebd9ab3
    • Linus Torvalds's avatar
      Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm · b4b90341
      Linus Torvalds authored
      * 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
        [ARM] 3683/2:  ARM: Convert at91rm9200 to generic irq handling
        [ARM] 3682/2:  ARM: Convert ixp4xx to generic irq handling
        [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling
        [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling
        [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling
        [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling
        [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling
        [ARM] 3697/1: ARM: Convert shark to generic irq handling
        [ARM] 3696/1: ARM: Convert clps711x to generic irq handling
        [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling
        [ARM] 3693/1: ARM: Convert omap1 to generic irq handling
        [ARM] 3691/1: ARM: Convert imx to generic irq handling
        [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling
        [ARM] 3687/1: ARM: Convert integrator to generic irq handling
        [ARM] 3685/1: ARM: Convert pxa to generic irq handling
        [ARM] 3684/1: ARM: Convert l7200 to generic irq handling
        [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling
        [ARM] 3680/1: ARM: Convert footbridge to generic irq handling
        [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes
        [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes
        ...
      
      Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless
      code).
      b4b90341
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · a8c4c20d
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (44 commits)
        [ARM] 3541/2: workaround for PXA27x erratum E7
        [ARM] nommu: provide a way for correct control register value selection
        [ARM] 3705/1: add supersection support to ioremap()
        [ARM] 3707/1: iwmmxt: use the generic thread notifier infrastructure
        [ARM] 3706/2: ep93xx: add cirrus logic edb9315a support
        [ARM] 3704/1: format IOP Kconfig with tabs, create more consistency
        [ARM] 3703/1: Add help description for ARCH_EP80219
        [ARM] 3678/1: MMC: Make OMAP MMC work
        [ARM] 3677/1: OMAP: Update H2 defconfig
        [ARM] 3676/1: ARM: OMAP: Fix dmtimers and timer32k to compile on OMAP1
        [ARM] Add section support to ioremap
        [ARM] Fix sa11x0 SDRAM selection
        [ARM] Set bit 4 on section mappings correctly depending on CPU
        [ARM] 3666/1: TRIZEPS4 [1/5] core
        ARM: OMAP: Multiplexing for 24xx GPMC wait pin monitoring
        ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
        ARM: OMAP: Update dmtimers
        ARM: OMAP: Make clock variables static
        ARM: OMAP: Fix GPMC compilation when DEBUG is defined
        ARM: OMAP: Mux updates for external DMA and GPIO
        ...
      a8c4c20d
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc · 168d04b3
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
        [MMC] sdhci: version bump sdhci
        [MMC] sdhci: support controller specific quirks
        [MMC] sdhci: more DMA capabilities tests
        [MMC] sdhci: reset sdhci controller early
        [MMC] sdhci: check controller version
        [MMC] sdhci: check only relevant inhibit bits
        [MMC] sdhci: Test for invalid block size
        [MMC] sdhci: Avoid sdhci DMA boundaries
        [MMC] Fix sdhci PIO routines
        [MMC] sdhci: fix interrupt handling
        [MMC] sdhci: correct register order
        [MMC] sdhci: proper timeout handling
        [MMC] sdhci: fix sdhci reset timeout
        [MMC] sdhci: fix timeout loops in sdhci
        [MMC] sdhci: support for multiple voltages
        [MMC] sdhci: print device id
        [MMC] sdhci: check SDHCI base clock
      168d04b3