1. 18 Feb, 2011 3 commits
  2. 04 Feb, 2011 15 commits
  3. 03 Feb, 2011 12 commits
  4. 01 Feb, 2011 1 commit
  5. 31 Jan, 2011 9 commits
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 0fd08c55
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFS: NFSv4 readdir loses entries
        NFS: Micro-optimize nfs4_decode_dirent()
        NFS: Fix an NFS client lockdep issue
        NFS construct consistent co_ownerid for v4.1
        NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount
        NFS improve pnfs_put_deviceid_cache debug print
        NFS fix cb_sequence error processing
        NFS do not find client in NFSv4 pg_authenticate
        NLM: Fix "kernel BUG at fs/lockd/host.c:417!" or ".../host.c:283!"
        NFS: Prevent memory allocation failure in nfsacl_encode()
        NFS: nfsacl_{encode,decode} should return signed integer
        NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"
        NFS: Fix "kernel BUG at fs/aio.c:554!"
        NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().
        NFS: fix handling of malloc failure during nfs_flush_multi()
      0fd08c55
    • Linus Torvalds's avatar
      Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm · 7921127e
      Linus Torvalds authored
      * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: smp_on_up: allow non-ARM SMP processors
        ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
        ARM: initrd: disable initrd if passed address overlaps reserved region
        ARM: footbridge: fix debug macros
        ARM: mmci: round down the bytes transferred on error
        ARM: mmci: complete the transaction on error
        ARM: 6642/1: mmci: calculate remaining bytes at error correctly
      7921127e
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-for-linus' of... · 35a8524f
      Linus Torvalds authored
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
        arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
        arm: omap2: mux: fix compile warning
        omap1: Simplify use of omap_irq_flags
        omap2+: Fix unused variable warning for omap_irq_base
      35a8524f
    • Randy Dunlap's avatar
      kernel.h: fix kernel-doc warning · ffbbf2da
      Randy Dunlap authored
      Fix kernel-doc warning in kernel.h from commit 7ef88ad5
      ("BUILD_BUG_ON: make it handle more cases"):
      
        Warning(include/linux/kernel.h:605): No description found for parameter 'condition'
        Warning(include/linux/kernel.h:605): Excess function parameter 'cond' description in 'BUILD_BUG_ON'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ffbbf2da
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · fb9f1f17
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: xfs_bmap_add_extent_delay_real should init br_startblock
        xfs: fix dquot shaker deadlock
        xfs: handle CIl transaction commit failures correctly
        xfs: limit extsize to size of AGs and/or MAXEXTLEN
        xfs: prevent extsize alignment from exceeding maximum extent size
        xfs: limit extent length for allocation to AG size
        xfs: speculative delayed allocation uses rounddown_power_of_2 badly
        xfs: fix efi item leak on forced shutdown
        xfs: fix log ticket leak on forced shutdown.
      fb9f1f17
    • Michael S. Tsirkin's avatar
      virtio: update MAINTAINERS · 2426ec8f
      Michael S. Tsirkin authored
      Patches should keep coming through Rusty but it helps if I'm Cc'd as
      well.
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2426ec8f
    • Linus Torvalds's avatar
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · cbae4873
      Linus Torvalds authored
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
        usb: gadget: composite: avoid access beyond array max length
        USB: serial: handle Data Carrier Detect changes
        USB: gadget: Fix endpoint representation in ci13xxx_udc
        USB: gadget: Fix error path in ci13xxx_udc gadget probe function
        usb: pch_udc: Fix the worning log issue at gadget driver remove
        USB: serial: Updated support for ICOM devices
        USB: ehci-mxc: add work-around for efika mx/sb bug
        USB: unbreak ehci-mxc on otg port of i.MX27
        drivers: update to pl2303 usb-serial to support Motorola cables
        USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
        USB serial: add missing .usb_driver field in serial drivers
        USB: ehci-fsl: Fix 'have_sysif_regs' detection
        USB: g_printer: fix bug in module parameter definitions
        USB: g_printer: fix bug in unregistration
        USB: uss720: remove duplicate USB device
        MAINTAINERS: add ueagle-atm entry
        USB: EHCI: fix DMA deallocation bug
        USB: pch_udc: support new device ML7213 IOH
        usb: pch_udc: Fixed issue which does not work with g_serial
        usb: set ep_dev async suspend should be later than device_initialize
        ...
      cbae4873
    • Linus Torvalds's avatar
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · fb1c6348
      Linus Torvalds authored
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits)
        staging: r8712u: Add new device IDs
        staging: brcm80211: fix suspend/resume issue in brcmsmac
        staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
        Staging: iio: Aditional fixpoint formatted output bugfix
        staging: usbip: vhci: use urb->dev->portnum to find port
        staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO
        staging: usbip: vhci: friendly log messages for connection errors
        staging: usbip: vhci: refuse to enqueue for dead connections
        staging: usbip: vhci: give back URBs from in-flight unlink requests
        staging: usbip: vhci: update reference count for usb_device
        staging: usbip: stub: update refcounts for devices and interfaces
        staging: tidspbridge: replace mbox callback with notifier_call
        staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
        Staging: speakup: &&/|| confusion in silent_store()
        iio: Fixpoint formatted output bugfix
        staging: rt2860: Fix incorrect netif_stop_queue usage warning
        staging: r8712u: Fix memory leak in firmware loading
        staging: tidspbridge: configure full L1 MMU range
        staging: rt2870sta: Add ID for Linksys WUSB100v2
        Staging: xgfib: put parenthesis in the right place
        ...
      fb1c6348
    • Linus Torvalds's avatar
      Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · abfa44b5
      Linus Torvalds authored
      * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        tty/serial: fix apbuart build
        n_hdlc: fix read and write locking
        serial: unbreak billionton CF card
        tty: use for_each_console() and WARN() on sysfs failures
        vt: fix issue when fbcon wants to takeover a second time.
      
      Fix up trivial conflict in drivers/tty/tty_io.c
      abfa44b5