1. 03 Jul, 2006 37 commits
  2. 02 Jul, 2006 3 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