1. 07 Jan, 2011 2 commits
    • Guennadi Liakhovetski's avatar
      dma: shdma: don't register the global die notifier multiple times · 661382fe
      Guennadi Liakhovetski authored
      A recent patch has added a die notifier to the shdma driver, however,
      it registers a static die-notifier object in the probe routine, i.e.,
      for each device instance. This is wrong and leads to a system lockup.
      This patch moves the die notifier registration to module init and
      exit routines respectively.
      Reported-by: default avatarMagnus Damm <damm@opensource.se>
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      661382fe
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 3c0cb7c3
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)
        ARM: DMA: add support for DMA debugging
        ARM: PL011: add DMA burst threshold support for ST variants
        ARM: PL011: Add support for transmit DMA
        ARM: PL011: Ensure IRQs are disabled in UART interrupt handler
        ARM: PL011: Separate hardware FIFO size from TTY FIFO size
        ARM: PL011: Allow better handling of vendor data
        ARM: PL011: Ensure error flags are clear at startup
        ARM: PL011: include revision number in boot-time port printk
        ARM: vexpress: add sched_clock() for Versatile Express
        ARM i.MX53: Make MX53 EVK bootable
        ARM i.MX53: Some bug fix about MX53 MSL code
        ARM: 6607/1: sa1100: Update platform device registration
        ARM: 6606/1: sa1100: Fix platform device registration
        ARM i.MX51: rename IPU irqs
        ARM i.MX51: Add ipu clock support
        ARM: imx/mx27_3ds: Add PMIC support
        ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()
        mx51: fix usb clock support
        MX51: Add support for usb host 2
        arch/arm/plat-mxc/ehci.c: fix errors/typos
        ...
      3c0cb7c3
  2. 06 Jan, 2011 38 commits