1. 13 5月, 2010 29 次提交
  2. 08 5月, 2010 1 次提交
  3. 04 5月, 2010 4 次提交
  4. 01 5月, 2010 6 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · be1066bb
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        Staging: vme: Re-introduce necessary brackets
        Staging: iio: fix up the iio_get_new_idr_val comment
        Staging: add Add Sitecom WL-349 to rtl8192su
        Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id
        staging: rtl8192su: add Support for Belkin F5D8053 v6
        Staging: dt3155: fix 50Hz configuration
        staging: usbip: Fix deadlock
        Staging: rtl8192su: add USB ID for 0bda:8171
        Staging: hv: name network device ethX rather than sethX
        Staging: hv: Fix up memory leak on HvCleanup
        Staging: hv: Fix a bug affecting IPv6
        staging: iio: ring_sw: Fix incorrect test on successful read of last value, causes infinite loop
        staging: iio: Function iio_get_new_idr_val() return negative value if fails.
        Staging: iio: adc: fix dangling pointers
        Staging: iio: light: fix dangling pointers
        Staging: iio: test for failed allocation
        staging: iio: lis3l02dq - incorrect ws used in container of call.
      be1066bb
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 87156d69
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        serial: drivers/serial/pmac_zilog.c: add missing unlock
        serial: 8250_pnp - add Fujitsu Wacom device
        tty: Fix regressions in the char driver conversion
      87156d69
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · e4049eb8
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (29 commits)
        USB: sl811-hcd: Fix device disconnect
        USB: ohci-at91: fix power management hanging
        USB: rename usb_buffer_alloc() and usb_buffer_free()
        USB: ti_usb: fix printk format warning
        USB: gadget: s3c-hsotg: Add missing unlock
        USB: fix build on OMAPs if CONFIG_PM_RUNTIME is not set
        USB: oxu210hp: release spinlock on error path
        USB: serial: option: add cinterion device id
        USB: serial: option: ZTEAC8710 Support with Device ID 0xffff
        USB: serial: pl2303: Hybrid reader Uniform HCR331
        USB: option: add ID for ZTE MF 330
        USB: xhci: properly set endpoint context fields for periodic eps.
        USB: xhci: properly set the "Mult" field of the endpoint context.
        USB: OHCI: don't look at the root hub to get the number of ports
        USB: don't choose configs with no interfaces
        USB: cdc-acm: add another device quirk
        USB: fix testing the wrong variable in fs_create_by_name()
        usb: Fix tusb6010 for DMA API
        musb_core: fix musb_init_controller() error cleanup path
        MUSB: fix DaVinci glue layer dependency
        ...
      e4049eb8
    • B
      edac, mce: Fix wrong mask and macro usage · 35d824b2
      Borislav Petkov 提交于
      Correct two mishaps which prevented reporting error type (CECC vs UECC)
      and extended error description.
      
      Cc: <stable@kernel.org> # 32.x,  33.x
      Signed-off-by: NBorislav Petkov <borislav.petkov@amd.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      35d824b2
    • R
      Inotify: Fix build failure in inotify user support · 12b1b321
      Ralf Baechle 提交于
      CONFIG_INOTIFY_USER defined but CONFIG_ANON_INODES undefined will result
      in the following build failure:
      
          LD      vmlinux
        fs/built-in.o: In function 'sys_inotify_init1':
        (.text.sys_inotify_init1+0x22c): undefined reference to 'anon_inode_getfd'
        fs/built-in.o: In function `sys_inotify_init1':
        (.text.sys_inotify_init1+0x22c): relocation truncated to fit: R_MIPS_26 against 'anon_inode_getfd'
        make[2]: *** [vmlinux] Error 1
        make[1]: *** [sub-make] Error 2
        make: *** [all] Error 2
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      12b1b321
    • L
      Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 · 8f2adb7c
      Linus Torvalds 提交于
      * 'merge' of git://git.secretlab.ca/git/linux-2.6:
        spi: spidev_test gives error upon 1-byte transfer
        omap2_mcspi: small fixes of output data format
        omap2_mcspi: Flush posted writes
        spi: spi_device memory should be released instead of device.
        spi: release device claimed by bus_find_device_by_name
        of: check for IS_ERR()
        serial/mpc52xx_uart: Drop outdated comments
        gpio: potential null dereference
      8f2adb7c