1. 28 Jun, 2006 35 commits
  2. 27 Jun, 2006 5 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · a39727f2
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        [netdrvr] Remove long-unused bits from Becker template drivers
        [netdrvr] natsemi: minor cleanups
        [netdrvr] natsemi: Separate out media initialization code
        [PATCH] WAN: update info page for a bunch of my drivers
        [PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch
        [PATCH] Fix phy id for LXT971A/LXT972A
        [PATCH] DM9000 - minor code cleanups
        [PATCH] DM9000 - do no re-init spin lock
        [PATCH] DM9000 - check for MAC left in by bootloader
        [PATCH] DM9000 - better checks for platform resources
      a39727f2
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · 936813a8
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6:
        [MTD] NAND: Select chip before checking write protect status
        [MTD] CORE mtdchar.c: fix off-by-one error in lseek()
        [MTD] NAND: Fix typo in mtd/nand/ts7250.c
        [JFFS2][XATTR] coexistence between xattr and write buffering support.
        [JFFS2][XATTR] Fix wrong copyright
        [JFFS2][XATTR] Re-define xd->refcnt as atomic_t
        [JFFS2][XATTR] Fix memory leak with jffs2_xattr_ref
        [JFFS2][XATTR] rid unnecessary writing of delete marker.
        [JFFS2][XATTR] Fix ACL bug when updating null xattr by null ACL.
        [JFFS2][XATTR] using 'delete marker' for xdatum/xref deletion
        [MTD] Fix off-by-one error in physmap.c
        [MTD] Remove unused 'nr_banks' variable from ixp2000 map driver
        [MTD NAND] s3c2412 support in s3c2410.c
        [MTD] Initialize 'writesize'
        [MTD] NAND: ndfc fix address offset thinko
        [MTD] NAND: S3C2410 convert prinks to dev_*()s
        [MTD] NAND: Missing fixups
      936813a8
    • Linus Torvalds's avatar
      Merge git://oss.sgi.com:8090/nathans/xfs-2.6 · 73a0e405
      Linus Torvalds authored
      * git://oss.sgi.com:8090/nathans/xfs-2.6:
        [XFS] Fixup whitespace damage in log_write, remove final warning.
        [XFS] Rework code snippets slightly to remove remaining recent-gcc
        [XFS] Fix realtime subvolume expansion, a porting bug b0rked it.  Coverity
        [XFS] Remove a race condition where a linked inode could BUG_ON in
        [XFS] Remove redundant directory checks from inode link operation.
        [XFS] Remove a couple of no-longer-used macros.
        [XFS] Reduce size of xfs_trans_t structure. * remove ->t_forw, ->t_back --
        [XFS] remove unused behaviour lock - shrink XFS vnode as a side effect.
        [XFS] * There is trivial "inode => vnode => inode" conversion, but only
        [XFS] link(2) on directory is banned in VFS.
      73a0e405
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 03529d9f
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] ata_piix: add ICH6/7/8 to Kconfig
        [PATCH] sata_sil: disable hotplug interrupts on two ATI IXPs
        [PATCH] libata: cosmetic updates
        [PATCH] ata: add some NVIDIA chipset IDs
        [PATCH] libata reduce timeouts
        [PATCH] libata: implement ata_port_max_devices()
        [PATCH] libata: make two functions global
        [PATCH] libata: update ata_do_simple_cmd()
        [PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal()
        [PATCH] libata: clear EH action on device detach
        [PATCH] libata: implement and use ata_deh_dev_action()
        [PATCH] libata: move ata_eh_clear_action() upward
        [PATCH] libata.h needs scatterlist.h
        [libata] sata_vsc: partially revert a PCI ID-related commit
        [libata] Bump versions
      03529d9f
    • Linus Torvalds's avatar
      Properly delete sound/ppc/toonie.c · 11bcab90
      Linus Torvalds authored
      
      
      The previous "delete" had actually just truncated it to a zero
      size, something that can easily happen if you just apply a patch.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      11bcab90