31 Jan, 2011

32 commits


22 Jan, 2011

8 commits

  • Linus Torvalds
     
  • * 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (101 commits)
    [media] staging/lirc: fix mem leaks and ptr err usage
    [media] hdpvr: reduce latency of i2c read/write w/recycled buffer
    [media] hdpvr: enable IR part
    [media] rc/mceusb: timeout should be in ns, not us
    [media] v4l2-device: fix 'use-after-freed' oops
    [media] v4l2-dev: don't memset video_device.dev
    [media] zoran: use video_device_alloc instead of kmalloc
    [media] w9966: zero device state after a detach
    [media] v4l: Fix a use-before-set in the control framework
    [media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h
    [media] DocBook/v4l: update V4L2 revision and update copyright years
    [media] DocBook/v4l: fix validation error in dev-rds.xml
    [media] v4l2-ctrls: queryctrl shouldn't attempt to replace V4L2_CID_PRIVATE_BASE IDs
    [media] v4l2-ctrls: fix missing 'read-only' check
    [media] pvrusb2: Provide more information about IR units to lirc_zilog and ir-kbd-i2c
    [media] ir-kbd-i2c: Add back defaults setting for Zilog Z8's at addr 0x71
    [media] lirc_zilog: Update TODO.lirc_zilog
    [media] lirc_zilog: Add Andy Walls to copyright notice and authors list
    [media] lirc_zilog: Remove useless struct i2c_driver.command function
    [media] lirc_zilog: Remove unneeded tests for existence of the IR Tx function
    ...

    Linus Torvalds
     
  • Fix up comments in the key management code. No functional changes.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Do a bit of a style clean up in the key management code. No functional
    changes.

    Done using:

    perl -p -i -e 's!^/[*]*/\n!!' security/keys/*.c
    perl -p -i -e 's!} /[*] end [a-z0-9_]*[(][)] [*]/\n!}\n!' security/keys/*.c
    sed -i -s -e ": next" -e N -e 's/^\n[}]$/}/' -e t -e P -e 's/^.*\n//' -e "b next" security/keys/*.c

    To remove /*****/ lines, remove comments on the closing brace of a
    function to name the function and remove blank lines before the closing
    brace of a function.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    cifs: fix up CIFSSMBEcho for unaligned access
    cifs: fix unaligned accesses in cifsConvertToUCS
    cifs: clean up unaligned accesses in cifs_unicode.c
    cifs: fix unaligned access in check2ndT2 and coalesce_t2
    cifs: clean up unaligned accesses in validate_t2
    cifs: use get/put_unaligned functions to access ByteCount
    cifs: move time field in cifsInodeInfo
    cifs: TCP_Server_Info diet
    CIFS: Implement cifs_strict_readv (try #4)
    CIFS: Implement cifs_file_strict_mmap (try #2)
    CIFS: Implement cifs_strict_fsync
    CIFS: Make cifsFileInfo_put work with strict cache mode

    Linus Torvalds
     
  • * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
    x86,percpu: Move out of place 64 bit ops into X86_64 section

    Linus Torvalds
     
  • * 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
    workqueue: note the nested NOT_RUNNING test in worker_clr_flags() isn't a noop
    workqueue: relax lockdep annotation on flush_work()

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
    um: Use generic irq Kconfig
    tile: Use generic irq Kconfig
    sparc: Use generic irq Kconfig
    score: Use generic irq Kconfig
    powerpc: Use generic irq Kconfig
    parisc: Use generic irq Kconfig
    mn10300: Use generic irq Kconfig
    microblaze: Use generic irq Kconfig
    m68knommu: Use generic irq Kconfig
    ia64: Use generic irq Kconfig
    frv: Use generic irq Kconfig
    blackfin: Use generic irq Kconfig
    alpha: Use generic irq Kconfig
    genirq: Remove __do_IRQ
    m32r: Convert to generic irq Kconfig
    m32r: Convert usrv platform irq handling
    m32r: Convert opsput_lcdpld irq chip
    m32r: Convert opsput lanpld irq chip
    m32r: Convert opsput pld irq chip
    m32r: Convert opsput irq chip
    ...

    Linus Torvalds