1. 15 9月, 2011 28 次提交
  2. 24 8月, 2011 1 次提交
  3. 23 8月, 2011 1 次提交
  4. 10 8月, 2011 1 次提交
  5. 09 8月, 2011 1 次提交
  6. 05 8月, 2011 1 次提交
  7. 04 8月, 2011 1 次提交
  8. 26 7月, 2011 6 次提交
    • P
      eventpoll: fix comment typo 'evenpoll' · 10bd2473
      Paul Bolle 提交于
      Signed-off-by: NPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      10bd2473
    • L
      p9: avoid unused variable warning · e08dc132
      Linus Torvalds 提交于
      Commit 4e34e719 ("fs: take the ACL checks to common code") removed
      the use of the 'acl' variable in v9fs_iop_get_acl(), but left the
      variable definition around.  Remove it to get rid of the warning:
      
        fs/9p/acl.c: In function ‘v9fs_iop_get_acl’:
        fs/9p/acl.c:101:20: warning: unused variable ‘acl’
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e08dc132
    • L
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 13805165
      Linus Torvalds 提交于
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
        staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
        staging:iio:kfifo_buf fix double initialization of the ring device structure.
        staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
        staging:iio:imu fix missing register table index for some channels
        spectra: enable device before poking it
        staging: rts_pstor: Fix a miswriting
        staging/lirc_bt829: Return -ENODEV when no hardware is found.
        staging/lirc_parallel: remove pointless prototypes.
        staging/lirc_parallel: fix panic on rmmod
        staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
        Staging: zram: Fix kunmapping order
        Revert "gma500: Fix dependencies"
        gma500: Add medfield header
        gma500: wire up the mrst i2c bus from chip_info
        gma500: Fix DPU build
        gma500: Clean up the DPU config and make it runtime
        gma500: resync with Medfield progress
        gma500: Use the mrst helpers and power control for mode commit
        gma500@ Fix backlight range error
        gma500: More Moorestown muddle meddling means MM maybe might modeset
        ...
      
      Fix up fairly trivial conflicts all over, mostly due to header file
      cleanup conflicts, but some deleted files and some just context changes:
       - Documentation/feature-removal-schedule.txt
       - drivers/staging/bcm/headers.h
       - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
       - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
       - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
       - drivers/staging/brcm80211/brcmfmac/wl_iw.c
       - drivers/staging/et131x/et131x_netdev.c
       - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
       - drivers/staging/rtl8192e/r8192E.h
       - drivers/staging/usbip/userspace/src/utils.h
      13805165
    • L
      Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · d5ef6423
      Linus Torvalds 提交于
      * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
        amba pl011: workaround for uart registers lockup
        n_gsm: fix the wrong FCS handling
        pch_uart: add missing comment about OKI ML7223
        pch_uart: Add MSI support
        tty: fix "IRQ45: nobody cared"
        PTI feature to allow user to name and mark masterchannel request.
        0 for o PTI Makefile bug.
        tty: serial: samsung.c remove legacy PM code.
        SERIAL: SC26xx: Fix link error.
        serial: mrst_max3110: initialize waitqueue earlier
        mrst_max3110: Change max missing message priority.
        tty: s5pv210: Add delay loop on fifo reset function for UART
        tty/serial: Fix XSCALE serial ports, e.g. ce4100
        serial: bfin_5xx: fix off-by-one with resource size
        drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
        tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
        tty: n_gsm: Add raw-ip support
        tty: n_gsm: expose gsmtty device nodes at ldisc open time
        pch_phub: Fix register miss-setting issue
        serial: 8250, increase PASS_LIMIT
        ...
      d5ef6423
    • L
      Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · f549953c
      Linus Torvalds 提交于
      * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (115 commits)
        EHCI: fix direction handling for interrupt data toggles
        USB: serial: add IDs for WinChipHead USB->RS232 adapter
        USB: OHCI: fix another regression for NVIDIA controllers
        usb: gadget: m66592-udc: add pullup function
        usb: gadget: m66592-udc: add function for external controller
        usb: gadget: r8a66597-udc: add pullup function
        usb: renesas_usbhs: support multi driver
        usb: renesas_usbhs: inaccessible pipe is not an error
        usb: renesas_usbhs: care buff alignment when dma handler
        USB: PL2303: correctly handle baudrates above 115200
        usb: r8a66597-hcd: fixup USB_PORT_STAT_C_SUSPEND shift
        usb: renesas_usbhs: compile/config are rescued
        usb: renesas_usbhs: fixup comment-out
        usb: update email address in ohci-sh and r8a66597-hcd
        usb: r8a66597-hcd: add function for external controller
        EHCI: only power off port if over-current is active
        USB: mon: Allow to use usbmon without debugfs
        USB: EHCI: go back to using the system clock for QH unlinks
        ehci: add pci quirk for Ordissimo and RM Slate 100 too
        ehci: refactor pci quirk to use standard dmi_check_system method
        ...
      
      Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
      f549953c
    • L
      Merge branch 'driver-core-next' of... · f0deb97a
      Linus Torvalds 提交于
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        updated Documentation/ja_JP/SubmittingPatches
        debugfs: add documentation for debugfs_create_x64
        uio: uio_pdrv_genirq: Add OF support
        firmware: gsmi: remove sysfs entries when unload the module
        Documentation/zh_CN: Fix messy code file email-clients.txt
        driver core: add more help description for "path to uevent helper"
        driver-core: modify FIRMWARE_IN_KERNEL help message
        driver-core: Kconfig grammar corrections in firmware configuration
        DOCUMENTATION: Replace create_device() with device_create().
        DOCUMENTATION: Update overview.txt in Doc/driver-model.
        pti: pti_tty_install documentation mispelling.
      f0deb97a