1. 02 May, 2006 27 commits
  2. 01 May, 2006 6 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 1f4a9067
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Update version and reldate
        [TG3]: Fix bug in nvram write
        [TG3]: Add reset_phy parameter to chip reset functions
        [TG3]: Reset chip when changing MAC address
        [TG3]: Add phy workaround
        [TG3]: Call netif_carrier_off() during phy reset
        [IPV6]: Fix race in route selection.
        [XFRM]: fix incorrect xfrm_policy_afinfo_lock use
        [XFRM]: fix incorrect xfrm_state_afinfo_lock use
        [TCP]: Fix unlikely usage in tcp_transmit_skb()
        [XFRM]: fix softirq-unsafe xfrm typemap->lock use
        [IPSEC]: Fix IP ID selection
        [NET]: use hlist_unhashed()
        [IPV4]: inet_init() -> fs_initcall
        [NETLINK]: cleanup unused macro in net/netlink/af_netlink.c
        [PKT_SCHED] netem: fix loss
        [X25]: fix for spinlock recurse and spinlock lockup with timer handler
      1f4a9067
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 0d262424
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Disable preemption during flush_tlb_pending().
        [SPARC64]: Kill __flush_tlb_page() prototype.
      0d262424
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 9f29333d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: make EVIOCGSND return meaningful data
        Input: ressurect EVIOCGREP and EVIOCSREP
        Input: psmouse - fix new device detection logic
        Input: move input_device_id to mod_devicetable.h
        Input: allow using several chords for braille
        Input: allow passing NULL to input_free_device()
        Input: spitzkbd - fix the reversed Address and Calender keys
        Input: ads7846 - improve filtering for thumb press accuracy
        Input: ads7846 - report 0 pressure value along with pen up event
        Input: ads7846 - handle IRQs that were latched during disabled IRQs
        Input: ads7846 - miscellaneous fixes
        Input: ads7846 - use msleep() instead of udelay() in suspend
        Input: ads7846 - debouncing and rudimentary sample filtering
        Input: ads7846 - power down ADC a bit later
        Input: ads7846 - add pen_down sysfs attribute
        Input: wistron - add support for Fujitsu N3510
        Input: wistron - add signature for Amilo M7400
      9f29333d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa · 494b9aea
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (22 commits)
        [ALSA] via82xx - Use DXS_SRC as default for VIA8235/8237/8251 chips
        [ALSA] hda-codec - Add model entry for ASUS Z62F
        [ALSA] PCMCIA sound devices shouldn't depend on ISA
        [ALSA] hda-codec - Fix capture from line-in on VAIO SZ/FE laptops
        [ALSA] Fix Oops at rmmod with CONFIG_SND_VERBOSE_PROCFS=n
        [ALSA] PCM core - introduce CONFIG_SND_PCM_XRUN_DEBUG
        [ALSA] adding __devinitdata to pci_device_id
        [ALSA] add __devinitdata to all pci_device_id
        [ALSA] hda-codec - Add codec id for AD1988B codec chip
        [ALSA] hda-codec - Add model entry for ASUS M9 laptop
        [ALSA] pcxhr - Fix a compiler warning on 64bit architectures
        [ALSA] via82xx: tweak VT8251 workaround
        [ALSA] intel8x0 - Disable ALI5455 SPDIF-input
        [ALSA] via82xx: add support for VIA VT8251 (AC'97)
        [ALSA] Fix typos and add information about Jack support to Audiophile-Usb.txt
        [ALSA] Fix double free in error path of miro driver
        [ALSA] hda-codec - Add entry for Epox EP-5LDA+ GLi
        [ALSA] sound/pci/: remove duplicate #include's
        [ALSA] hda-codec - Use model 'hp' for all HP laptops with AD1981HD
        [ALSA] continue on IS_ERR from platform device registration
        ...
      494b9aea
    • David S. Miller's avatar
      [SPARC64]: Disable preemption during flush_tlb_pending(). · c9f2946f
      David S. Miller authored
      A context switch will force a call to flush_tlb_pending() (via
      switch_to()), so if we test tlb_nr to be non-zero, then sleep, it
      would become zero and later back at the original context we'll pass
      zero down into the TLB flushing code which should never see a nr
      argument of zero.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c9f2946f
    • David S. Miller's avatar
      [SPARC64]: Kill __flush_tlb_page() prototype. · 1241140f
      David S. Miller authored
      This function no longer exists.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1241140f
  3. 30 Apr, 2006 7 commits