1. 13 7月, 2006 37 次提交
  2. 12 7月, 2006 3 次提交
    • L
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · b2d67448
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] Fix sparse warnings.
        [S390] path grouping and path verifications fixes.
        [S390] xpram module parameter parsing.
        [S390] cpu_relax() is supposed to have barrier() semantics.
        [S390] fix futex_atomic_cmpxchg_inatomic
        [S390] subchannel register/unregister mutex.
        [S390] raw_local_save_flags/raw_local_irq_restore type check
        [S390] __builtin_trap() and gcc version.
      b2d67448
    • L
      Add PIIX4 APCI quirk for the 440MX chipset too · c6764664
      Linus Torvalds 提交于
      This is confirmed to fix a hang due to PCI resource conflicts with
      setting up the Cardbus bridge on old laptops with the 440MX chipsets.
      Original report by Alessio Sangalli, lspci debugging help by Pekka
      Enberg, and trial patch suggested by Daniel Ritz:
      
        "From the docs available i would _guess_ this thing is really similar
         to the 82443BX/82371AB combination.  at least the SMBus base address
         register is hidden at the very same place (32bit at 0x90 in function
         3 of the "south" brigde)"
      
      The dang thing is largely undocumented, but the patch was corroborated
      by Asit Mallick:
      
        "I am trying to find the register information. 440MX is an integration of
         440BX north-bridge without AGP and PIIX4E (82371EB).  PIIX4 quirk
         should cover the ACPI and SMBus related I/O registers."
      
      and verified to fix the problem by Alessio.
      
      Cc: Daniel Ritz <daniel.ritz-ml@swissonline.ch>
      Cc: Asit Mallick <asit.k.mallick@intel.com>
      Cc: Pekka Enberg <penberg@cs.helsinki.fi>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Dmitry Torokhov <dtor_core@ameritech.net>
      Tested-by: NAlessio Sangalli <alesan@manoweb.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      c6764664
    • L
      Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block · 826adfe4
      Linus Torvalds 提交于
      * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] splice: fix problems with sys_tee()
      826adfe4