1. 12 Dec, 2009 29 commits
  2. 11 Dec, 2009 11 commits
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 2fe77b81
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [ACPI/CPUFREQ] Introduce bios_limit per cpu cpufreq sysfs interface
        [CPUFREQ] make internal cpufreq_add_dev_* static
        [CPUFREQ] use an enum for speedstep processor identification
        [CPUFREQ] Document units for transition latency
        [CPUFREQ] Use global sysfs cpufreq structure for conservative governor tunings
        [CPUFREQ] Documentation: ABI: /sys/devices/system/cpu/cpu#/cpufreq/
        [CPUFREQ] powernow-k6: set transition latency value so ondemand governor can be used
        [CPUFREQ] cpumask: don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c
      2fe77b81
    • Greg Kroah-Hartman's avatar
      Staging: batman: fix debug Kconfig option · cb5228a6
      Greg Kroah-Hartman authored
      The debug batman option needs to depend on the correct
      config option.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      [ "No means no!"  - Linus ]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cb5228a6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 0f4974c4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (58 commits)
        tty: split the lock up a bit further
        tty: Move the leader test in disassociate
        tty: Push the bkl down a bit in the hangup code
        tty: Push the lock down further into the ldisc code
        tty: push the BKL down into the handlers a bit
        tty: moxa: split open lock
        tty: moxa: Kill the use of lock_kernel
        tty: moxa: Fix modem op locking
        tty: moxa: Kill off the throttle method
        tty: moxa: Locking clean up
        tty: moxa: rework the locking a bit
        tty: moxa: Use more tty_port ops
        tty: isicom: fix deadlock on shutdown
        tty: mxser: Use the new locking rules to fix setserial properly
        tty: mxser: use the tty_port_open method
        tty: isicom: sort out the board init logic
        tty: isicom: switch to the new tty_port_open helper
        tty: tty_port: Add a kref object to the tty port
        tty: istallion: tty port open/close methods
        tty: stallion: Convert to the tty_port_open/close methods
        ...
      0f4974c4
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 3126c136
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (21 commits)
        ext3: PTR_ERR return of wrong pointer in setup_new_group_blocks()
        ext3: Fix data / filesystem corruption when write fails to copy data
        ext4: Support for 64-bit quota format
        ext3: Support for vfsv1 quota format
        quota: Implement quota format with 64-bit space and inode limits
        quota: Move definition of QFMT_OCFS2 to linux/quota.h
        ext2: fix comment in ext2_find_entry about return values
        ext3: Unify log messages in ext3
        ext2: clear uptodate flag on super block I/O error
        ext2: Unify log messages in ext2
        ext3: make "norecovery" an alias for "noload"
        ext3: Don't update the superblock in ext3_statfs()
        ext3: journal all modifications in ext3_xattr_set_handle
        ext2: Explicitly assign values to on-disk enum of filetypes
        quota: Fix WARN_ON in lookup_one_len
        const: struct quota_format_ops
        ubifs: remove manual O_SYNC handling
        afs: remove manual O_SYNC handling
        kill wait_on_page_writeback_range
        vfs: Implement proper O_SYNC semantics
        ...
      3126c136
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · f4d544ee
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: Fix error return for fallocate() on XFS
        xfs: cleanup dmapi macros in the umount path
        xfs: remove incorrect sparse annotation for xfs_iget_cache_miss
        xfs: kill the STATIC_INLINE macro
        xfs: uninline xfs_get_extsz_hint
        xfs: rename xfs_attr_fetch to xfs_attr_get_int
        xfs: simplify xfs_buf_get / xfs_buf_read interfaces
        xfs: remove IO_ISAIO
        xfs: Wrapped journal record corruption on read at recovery
        xfs: cleanup data end I/O handlers
        xfs: use WRITE_SYNC_PLUG for synchronous writeout
        xfs: reset the i_iolock lock class in the reclaim path
        xfs: I/O completion handlers must use NOFS allocations
        xfs: fix mmap_sem/iolock inversion in xfs_free_eofblocks
        xfs: simplify inode teardown
      f4d544ee
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 0e2f7b83
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (235 commits)
        Staging: IIO: add selection of IIO_SW_RING to LIS3L02DQ as needed
        Staging: IIO: Add tsl2560-2 support to tsl2563 driver.
        Staging: IIO: Remove tsl2561 driver. Support merged with tsl2563.
        Staging: wlags49_h2: fix up signal levels
        + drivers-staging-wlags49_h2-remove-cvs-metadata.patch added to -mm tree
        Staging: samsung-laptop: add TODO file
        Staging: samsung-laptop: remove old kernel code
        Staging: add Samsung Laptop driver
        staging: batman-adv meshing protocol
        Staging: rtl8192u: depends on USB
        Staging: rtl8192u: remove dead code
        Staging: rtl8192u: remove bad whitespaces
        Staging: rtl8192u: make it compile
        Staging: Added Realtek rtl8192u driver to staging
        Staging: dream: add gpio and pmem support
        Staging: dream: add TODO file
        Staging: android: delete android drivers
        Staging: et131x: clean up the avail fields in the rx registers
        Staging: et131x: Clean up number fields
        Staging: et131x: kill RX_DMA_MAX_PKT_TIME
        ...
      0e2f7b83
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · f58df54a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (27 commits)
        Driver core: fix race in dev_driver_string
        Driver Core: Early platform driver buffer
        sysfs: sysfs_setattr remove unnecessary permission check.
        sysfs: Factor out sysfs_rename from sysfs_rename_dir and sysfs_move_dir
        sysfs: Propagate renames to the vfs on demand
        sysfs: Gut sysfs_addrm_start and sysfs_addrm_finish
        sysfs: In sysfs_chmod_file lazily propagate the mode change.
        sysfs: Implement sysfs_getattr & sysfs_permission
        sysfs: Nicely indent sysfs_symlink_inode_operations
        sysfs: Update s_iattr on link and unlink.
        sysfs: Fix locking and factor out sysfs_sd_setattr
        sysfs: Simplify iattr time assignments
        sysfs: Simplify sysfs_chmod_file semantics
        sysfs: Use dentry_ops instead of directly playing with the dcache
        sysfs: Rename sysfs_d_iput to sysfs_dentry_iput
        sysfs: Update sysfs_setxattr so it updates secdata under the sysfs_mutex
        debugfs: fix create mutex racy fops and private data
        Driver core: Don't remove kobjects in device_shutdown.
        firmware_class: make request_firmware_nowait more useful
        Driver-Core: devtmpfs - set root directory mode to 0755
        ...
      f58df54a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 748e566b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (122 commits)
        USB: mos7840: add device IDs for B&B electronics devices
        USB: ftdi_sio: add USB device ID's for B&B Electronics line
        USB: musb: musb_host: fix sparse warning
        USB: musb: musb_gadget: fix sparse warning
        USB: musb: omap2430: fix sparse warning
        USB: core: message: fix sparse warning
        USB: core: hub: fix sparse warning
        USB: core: fix sparse warning for static function
        USB: Added USB_ETH_RNDIS to use instead of CONFIG_USB_ETH_RNDIS
        USB: Check bandwidth when switching alt settings.
        USB: Refactor code to find alternate interface settings.
        USB: xhci: Fix command completion after a drop endpoint.
        USB: xhci: Make reverting an alt setting "unfailable".
        USB: usbtmc: Use usb_clear_halt() instead of custom code.
        USB: xhci: Add correct email and files to MAINTAINERS entry.
        USB: ehci-omap.c: introduce missing kfree
        USB: xhci-mem.c: introduce missing kfree
        USB: add remove_id sysfs attr for usb drivers
        USB: g_multi kconfig: fix depends and help text
        USB: option: add pid for ZTE
        ...
      748e566b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 · 5f1141eb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        firewire: ohci: handle receive packets with a data length of zero
      5f1141eb
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 880188b2
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        kgdb: Always process the whole breakpoint list on activate or deactivate
        kgdb: continue and warn on signal passing from gdb
        kgdb,x86: do not set kgdb_single_step on x86
        kgdb: allow for cpu switch when single stepping
        kgdb,i386: Fix corner case access to ss with NMI watch dog exception
        kgdb: Replace strstr() by strchr() for single-character needles
        kgdbts: Read buffer overflow
        kgdb: Read buffer overflow
        kgdb,x86: remove redundant test
      880188b2
    • Alan Cox's avatar
      tty: split the lock up a bit further · 36ba782e
      Alan Cox authored
      The tty count sanity check may need the BKL, that isn't clear. However it
      is clear that the count use of the lock is internal and independant of the
      bigger use of the lock.
      
      Furthermore the file list locking is also separately locked already
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      36ba782e