• Linus Torvalds's avatar
    Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm · 6d7ed21d
    Linus Torvalds authored
    * 'defcfg' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6647/1: add Versatile Express defconfig
      ARM: 6644/1: mach-ux500: update the U8500 defconfig
    
    * 'drivers' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 6764/1: pl011: factor out FIFO to TTY code
      ARM: 6763/1: pl011: add optional RX DMA to PL011 v2
      ARM: 6758/1: amba: support pm ops
      ARM: amba: make amba_driver id_table const
      ARM: amba: make internal ID table handling const
      ARM: amba: make probe() functions take const id tables
      ARM: 6662/1: amba: make amba_bustype non-static
      ARM: mmci: add dmaengine-based DMA support
      ARM: mmci: no need for separate host->data_xfered
      ARM: mmci: avoid unnecessary switch to data available PIO interrupts
      ARM: mmci: no need to call flush_dcache_page() with sg_miter API
      ARM: mmci: avoid reporting too many completed bytes on fifo overrun
      ALSA: AACI: make fifo variables more explanitory
      ALSA: AACI: no need to call snd_pcm_period_elapsed() for each period
      ALSA: AACI: use snd_pcm_lib_period_bytes()
      ALSA: AACI: clean up AACI announcement printk
      ALSA: AACI: fix channel mask selection
      ALSA: AACI: fix number of channels for record
      ALSA: AACI: fix multiple IRQ claiming
    
    * 'cyberpro-next' of master.kernel.org:/home/rmk/linux-2.6-arm:
      VIDEO: cyberpro: remove unused cyber2000fb_get_fb_var()
      VIDEO: cyberpro: remove useless function extreg pointers
      VIDEO: cyberpro: update handling of device structures
      VIDEO: cyberpro: add support for video capture I2C
      VIDEO: cyberpro: make 'reg_b0_lock' always present
      VIDEO: cyberpro: add I2C support
      VIDEO: cyberpro: select lowest multipler/divisor for PLL
    6d7ed21d
rtc-pl030.c 4.04 KB