1. 01 Nov, 2006 19 commits
  2. 27 Oct, 2006 4 commits
  3. 26 Oct, 2006 5 commits
  4. 25 Oct, 2006 5 commits
  5. 23 Oct, 2006 7 commits
    • Linus Torvalds's avatar
      Linux 2.6.19-rc3 · 7059abed
      Linus Torvalds authored
      7059abed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 6d03a68e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (33 commits)
        [WATCHDOG] remove experimental on iTCO_wdt.c
        [WATCHDOG] Atmel AT91RM9200 rename.
        [WATCHDOG] includes for sample watchdog program.
        [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning
        [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)
        [WATCHDOG] add ich8 support to iTCO_wdt.c
        [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
        [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch
        [WATCHDOG] w83697hf/hg WDT driver - autodetect patch
        [WATCHDOG] w83697hf/hg WDT driver - patch 16
        [WATCHDOG] w83697hf/hg WDT driver - patch 15
        [WATCHDOG] w83697hf/hg WDT driver - patch 14
        [WATCHDOG] w83697hf/hg WDT driver - patch 13
        [WATCHDOG] w83697hf/hg WDT driver - patch 12
        [WATCHDOG] w83697hf/hg WDT driver - patch 11
        [WATCHDOG] w83697hf/hg WDT driver - patch 10
        [WATCHDOG] w83697hf/hg WDT driver - patch 9
        [WATCHDOG] w83697hf/hg WDT driver - patch 8
        [WATCHDOG] w83697hf/hg WDT driver - patch 7
        [WATCHDOG] w83697hf/hg WDT driver - patch 6
        ...
      6d03a68e
    • Linus Torvalds's avatar
      Revert unintentional and bogus change to drivers/pci/quirks.c · 0c0e4668
      Linus Torvalds authored
      In commit 4e8a5201 ("[PKT_SCHED] netem:
      Orphan SKB when adding to queue.") Davem mistakenly also included a
      temporary diff in his tree that disabled the pci_fixup_video VGA quirk,
      which broke sparc64.
      
      This reverts that part of the commit. Sayeth Davem:
      
        "Greg KH has a patch coming to you soon which will move that VGA code
         back into x86/x86_64/IA64 specific areas and will fix the sparc64
         problem properly."
      
      Special thanks to Claudio Martins <ctpm@ist.utl.pt> for noticing the
      error in the first place.
      
      Cc: Claudio Martins <ctpm@ist.utl.pt>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      0c0e4668
    • Tony Lindgren's avatar
      b983452b
    • Tony Lindgren's avatar
      ARM: OMAP: Set serial 8250 ECB for TX fifo · 26e460b3
      Tony Lindgren authored
      Code to fix serial TX fifo by Richard Woodruff.
      
      The extended capabilities bit is needed to write fcr, or else some
      settings don't get set.  That is what the OMAP-UART data sheet says.
      The write water mark bits 4:5 are not accessible unless ECB is set.
      
      The data sheet says it is TI16C750 compatible but it seems to share more
      with what the code calls a TI16C752.  The 750 has a DLAB to set 64bit
      fifo and I don't believe that is the case for ours.
      
      A minor note is we are still only using 32 bytes of the 64 byte TX fifo
      for transmits in the current code.  I'm not sure if there is an
      application that this matters to.
      
      Note that the current code id's OMAP serial ports as a 16654 which isn't
      quite correct.
      
      Also note that to use the actual TX watermark interrupt set at 32bytes
      required too ugly of a hack to use (not use OMAP_SCR=0).
      26e460b3
    • Tony Lindgren's avatar
      Merge with mainline: Add back omap 8250 hacks · ce1c532e
      Tony Lindgren authored
      Add back omap 8250 hacks
      ce1c532e
    • Tony Lindgren's avatar
      Sync with mainline: drivers/serial/8250.c · 572012cf
      Tony Lindgren authored
      Use mainline 8250.c
      572012cf