1. 24 Sep, 2006 3 commits
    • David S. Miller's avatar
      [SPARC64]: Fix sched_clock() wrapping every ~17 seconds. · e17ba8f5
      David S. Miller authored
      Unfortunately, sparc64 doesn't have an easy way to do a "64 X 64 -->
      128" bit multiply like PowerPC and IA64 do.  We were doing a
      "64 X 64 --> 64" bit multiple which causes overflow very quickly with
      a 30-bit quotient shift.
      
      So use a quotientshift count of 10 instead of 30, just like x86 and
      ARM do.
      
      This also fixes the wrapping of printk timestamp values every ~17
      seconds.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e17ba8f5
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 1ab9dd09
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6:
        [MTD] Whitespace cleanup in SSFDC driver.
        [MTD] SSFDC translation layer minor cleanup
        [MTD] Fix dependencies with CONFIG_MTD=m
      1ab9dd09
    • Linus Torvalds's avatar
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · f7425b16
      Linus Torvalds authored
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)
        [ALSA] intel8x0m - Free irq in suspend
        [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig
        [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII
        [ALSA] ES1938: remove duplicate field initialization
        [ALSA] usb-audio: increase number of packets per URB
        [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec
        [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()
        [ALSA] hda-codec - Fix mic input with STAC92xx codecs
        [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values
        [ALSA] hda-codec - Support multiple headphone pins
        [ALSA] hda_intel prefer 24bit instead of 20bit
        [ALSA] hda-codec - Add vendor ids for Motorola and Conexant
        [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec
        [ALSA] Add missing compat ioctls for ALSA control API
        [ALSA] powermac - Fix Oops when conflicting with aoa driver
        [ALSA] aoa: add locking to tas codec
        [ALSA] hda-intel - Fix suspend/resume with MSI
        ...
      f7425b16
  2. 23 Sep, 2006 37 commits