1. 26 Feb, 2007 38 commits
  2. 21 Feb, 2007 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 9654640d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] One line missing from previous commit
        [CIFS] mtime bounces from local to remote when cifs nocmtime i_flags overwritten
        [CIFS] fix &&/& typo in cifs_setattr()
      9654640d
    • Linus Torvalds's avatar
      Revert "e1000: fix shared interrupt warning message" · b5bf28cd
      Linus Torvalds authored
      This reverts commit d2ed1635.
      
      As Thomas Gleixner reports:
        "e1000 is not working anymore. ifup fails permanentely.
          ADDRCONF(NETDEV_UP): eth0: link is not ready
         nothing else"
      
      The broken commit was identified with "git bisect".
      
      Auke Kok says:
        "I think we need to drop this now.  The report that says that this
         *fixes* something might have been on regular interrupts only.  I
         currently suspect that it breaks all MSI interrupts, which would make
         sense if I look a the code.  Very bad indeed."
      
      Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
      Acked-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b5bf28cd