1. 24 Mar, 2006 5 commits
    • Evgeniy Polyakov's avatar
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6 · a1a051b1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6:
        NTFS: 2.1.27 - Various bug fixes and cleanups.
        NTFS: Semaphore to mutex conversion.
        NTFS: Handle the recently introduced -ENAMETOOLONG return value from
        NTFS: Add a missing call to flush_dcache_mft_record_page() in
        NTFS: Fix a bug in fs/ntfs/inode.c::ntfs_read_locked_index_inode() where we
        NTFS: Improve comments on file attribute flags in fs/ntfs/layout.h.
        NTFS: Limit name length in fs/ntfs/unistr.c::ntfs_nlstoucs() to maximum
        NTFS: Remove all the make_bad_inode() calls.  This should only be called
        NTFS: Add support for sparse files which have a compression unit of 0.
        NTFS: Fix comparison of $MFT and $MFTMirr to not bail out when there are
        NTFS: Use buffer_migrate_page() for the ->migratepage function of all ntfs
        NTFS: Fix a buggette in an "should be impossible" case handling where we
        NTFS: Fix an (innocent) off-by-one error in the runlist code.
        NTFS: Fix two compiler warnings on Alpha.  Thanks to Andrew Morton for
      a1a051b1
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · aca361c1
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits)
        [PATCH] Restore channel setting after scan.
        [PATCH] hostap: Fix memory leak on PCI probe error path
        [PATCH] hostap: Remove dead code (duplicated idx != 0)
        [PATCH] hostap: Fix unlikely read overrun in CIS parsing
        [PATCH] hostap: Fix double free in prism2_config() error path
        [PATCH] hostap: Fix ap_add_sta() return value verification
        [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
        [PATCH] wireless/airo: cache wireless scans
        [PATCH] wireless/airo: define default MTU
        [PATCH] wireless/airo: clean up printk usage to print device name
        [PATCH] WE-20 for kernel 2.6.16
        [PATCH] softmac: remove function_enter()
        [PATCH] skge: version 1.5
        [PATCH] skge: compute available ring buffers
        [PATCH] skge: dont free skb until multi-part transmit complete
        [PATCH] skge: multicast statistics fix
        [PATCH] skge: rx_reuse called twice
        [PATCH] skge: dont use dev_alloc_skb for rx buffs
        [PATCH] skge: align receive buffers
        [PATCH] sky2: dont need to use dev_kfree_skb_any
        ...
      aca361c1
    • Linus Torvalds's avatar
      Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block · cec60620
      Linus Torvalds authored
      * 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23
        [PATCH] relay: consolidate sendfile() and read() code
        [PATCH] relay: add sendfile() support
        [PATCH] relay: migrate from relayfs to a generic relay API
      cec60620
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 88f07ffb
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (3568k): zoran: Use i2c_master_send when possible
        V4L/DVB (3568j): adv7175: Drop unused encoder dump command
        V4L/DVB (3568i): adv7175: Drop unused register cache
        V4L/DVB (3568h): cpia: correct email address
        V4L/DVB (3568g): sem2mutex: zoran
        V4L/DVB (3568f): saa7110: Fix array overrun
        V4L/DVB (3568e): bt856: Spare memory
        V4L/DVB (3568d): saa7111.c fix
        V4L/DVB (3568c): zoran: Init cleanups
        V4L/DVB (3568b): saa7111: Prevent array overrun
        V4L/DVB (3568a): saa7114: Fix i2c block write
      88f07ffb
  2. 23 Mar, 2006 35 commits