1. 10 Dec, 2009 21 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 78f1ae19
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
        ALSA: hda/realtek: quirk for D945GCLF2 mainboard
        ALSA: hda - Terradici HDA controllers does not support 64-bit mode
        ALSA: document: Add direct git link to grub hda-analyzer
        ALSA: radio/sound/miro: fix build, cleanup depends/selects
        ALSA: hda - Generalize EAPD inversion check in patch_analog.c
        ASoC: Wrong variable returned on error
        ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
        ALSA: hda - Exclude unusable ADCs for ALC88x
        ALSA: hda - Add missing Line-Out and PCM switches as slave
        ALSA: hda - iMac 9,1 sound patch.
        ALSA: opti93x: set MC indirect registers base from PnP data
      78f1ae19
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fa395aae
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (51 commits)
        Input: appletouch - give up maintainership
        Input: dm355evm_kbd - switch to using sparse keymap library
        Input: wistron_btns - switch to using sparse keymap library
        Input: add generic support for sparse keymaps
        Input: fix memory leak in force feedback core
        Input: wistron - remove identification strings from DMI table
        Input: psmouse - remove identification strings from DMI tables
        Input: atkbd - remove identification strings from DMI table
        Input: i8042 - remove identification strings from DMI tables
        DMI: allow omitting ident strings in DMI tables
        Input: psmouse - do not carry DMI data around
        Input: matrix-keypad - switch to using dev_pm_ops
        Input: keyboard - fix lack of locking when traversing handler->h_list
        Input: gpio_keys - scan gpio state at probe and resume time
        Input: keyboard - add locking around event handling
        Input: usbtouchscreen - add support for ET&T TC5UH touchscreen controller
        Input: xpad - add two new Xbox 360 devices
        Input: polled device - do not start polling if interval is zero
        Input: polled device - schedule first poll immediately
        Input: add S3C24XX touchscreen driver
        ...
      fa395aae
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 3e746831
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (345 commits)
        V4L/DVB (13542): ir-keytable: Allow dynamic table change
        V4L/DVB (13541): atbm8830: replace 64-bit division and floating point usage
        V4L/DVB (13540): ir-common: Cleanup get key evdev code
        V4L/DVB (13539): ir-common: add __func__ for debug messages
        V4L/DVB (13538): ir-common: Use a dynamic keycode table
        V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
        V4L/DVB (13536): em28xx: Use the full RC5 code on HVR-950 Remote Controller
        V4L/DVB (13535): ir-common: Add a hauppauge new table with the complete RC5 code
        V4L/DVB (13534): ir-common: Remove some unused fields/structs
        V4L/DVB (13533): ir: use dynamic tables, instead of static ones
        V4L/DVB (13532): ir-common: Add infrastructure to use a dynamic keycode table
        V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it
        V4L/DVB (13458): go7007: subdev conversion
        V4L/DVB (13457): s2250: subdev conversion
        V4L/DVB (13456): s2250: Change module structure
        V4L/DVB (13528): em28xx: add support for em2800 VC211A card
        em28xx: don't reduce scale to half size for em2800
        em28xx: don't load audio modules when AC97 is mis-detected
        em28xx: em2800 chips support max width of 640
        V4L/DVB (13523): dvb-bt8xx: fix compile warning
        ...
      
      Fix up trivial conflicts due to spelling fixes from the trivial tree in
      	Documentation/video4linux/gspca.txt
      	drivers/media/video/cx18/cx18-mailbox.h
      3e746831
    • Linus Torvalds's avatar
      Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux · 6825fbc4
      Linus Torvalds authored
      * 'next-i2c' of git://git.fluff.org/bjdooks/linux: (25 commits)
        i2c-pnx: Map I2C adapter number to platform ID number
        i2c-omap: OMAP3: PM: (re)init for every transfer to support off-mode
        i2c-designware: i2c_dw_handle_tx_abort: Use dev_dbg() for NOACK cases
        i2c-designware: Cosmetic cleanups
        i2c-designware: Tx abort cleanups
        i2c-designware: Skip RX_FULL and TX_EMPTY bits on tx abort errors
        i2c-designware: i2c_dw_xfer_msg: Fix error handling procedures
        i2c-designware: Disable TX_EMPTY when all i2c_msg msgs has been processed
        i2c-designware: Process all i2c_msg messages in the interrupt handler
        i2c-designware: i2c_dw_read: Remove redundant target address checker
        i2c-designware: i2c_dw_func: Set I2C_FUNC_SMBUS_foo bits
        i2c-designware: Initialize byte count variables just prior to being used
        i2c-designware: i2c_dw_xfer_msg: Introduce a local "buf" pointer
        i2c-designware: Divide i2c_dw_xfer_msg into two functions
        i2c-designware: Enable RX_FULL interrupt
        i2c-designware: Set Tx/Rx FIFO threshold levels
        i2c-designware: Process i2c_msg messages in the interrupt handler
        i2c-designware: i2c_dw_xfer_msg: Fix i2c_msg search bug
        i2c-designware: Improved _HCNT/_LCNT calculation
        i2c-designware: Remove an useless local variable "num"
        ...
      6825fbc4
    • Linus Torvalds's avatar
      Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux · 6bb951a0
      Linus Torvalds authored
      * 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux:
        ARM: S3C24XX: DMA: Use valid index when accessing array
        ARM: S3C: move s3c_pwm_remove to .devexit.text
        ARM: S3C24XX: Export s3c24xx_set_fiq for modules.
        ARM: S3C: move s3c_adc_remove to .devexit.text
      6bb951a0
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 · e49aedb5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6:
        sl82c105: remove no longer needed debugging code
        sis5513: remove stale TODO
        pdc202xx_old: remove no longer needed debugging code
        cy82c693: remove no longer needed debugging code
        cmd64x: remove no longer needed debugging code
        alim15x3: remove obsolete and dangerous wdc_udma parameter
        ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
        cs5535: add pci id for AMD based CS5535 controllers
        slc90e66: fix UDMA handling
        drivers/ide/tx4938ide.c: use resource_size()
        drivers/ide/ide_platform.c: use resource_size()
        drivers/ide/au1xxx-ide.c: use resource_size()
        hpt366: remove dead old timing tables
        ide: update Kconfig text to mark as deprecated
        ide-tape: remove the BKL
        hpt366: kill unused #define's
      e49aedb5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 4ef58d4e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
        tree-wide: fix misspelling of "definition" in comments
        reiserfs: fix misspelling of "journaled"
        doc: Fix a typo in slub.txt.
        inotify: remove superfluous return code check
        hdlc: spelling fix in find_pvc() comment
        doc: fix regulator docs cut-and-pasteism
        mtd: Fix comment in Kconfig
        doc: Fix IRQ chip docs
        tree-wide: fix assorted typos all over the place
        drivers/ata/libata-sff.c: comment spelling fixes
        fix typos/grammos in Documentation/edac.txt
        sysctl: add missing comments
        fs/debugfs/inode.c: fix comment typos
        sgivwfb: Make use of ARRAY_SIZE.
        sky2: fix sky2_link_down copy/paste comment error
        tree-wide: fix typos "couter" -> "counter"
        tree-wide: fix typos "offest" -> "offset"
        fix kerneldoc for set_irq_msi()
        spidev: fix double "of of" in comment
        comment typo fix: sybsystem -> subsystem
        ...
      4ef58d4e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f6c4c819
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: add multi-input quirk for NextWindow Touchscreen.
        HID: add support for Acan FG-8100 barcode reader
        HID: make Media key on Logitech DiNovo Mini work
        HID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigator
        HID: remove BKL from hiddev_ioctl_usage()
        HID: fixup quirk for NCR devices
        HID: pidff - fix unnecessary loop iterations on reset
        HID: add NOGET quirk for another device from CH Products
        HID: remove useless DRIVER_VERSION macro
        HID: fix MODULE_AUTHOR usage in HID modules
        HID: blacklist Acer Ferrari 4005 optical mouse
      f6c4c819
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 382f51fe
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (222 commits)
        [SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
        [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
        [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
        [SCSI] zfcp: Update FSF error reporting
        [SCSI] zfcp: Improve ELS ADISC handling
        [SCSI] zfcp: Simplify handling of ct and els requests
        [SCSI] zfcp: Remove ZFCP_DID_MASK
        [SCSI] zfcp: Move WKA port to zfcp FC code
        [SCSI] zfcp: Use common code definitions for FC CT structs
        [SCSI] zfcp: Use common code definitions for FC ELS structs
        [SCSI] zfcp: Update FCP protocol related code
        [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
        [SCSI] zfcp: Assign scheduled work to driver queue
        [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
        [SCSI] zfcp: Implement module unloading
        [SCSI] zfcp: Merge trace code for fsf requests in one function
        [SCSI] zfcp: Access ports and units with container_of in sysfs code
        [SCSI] zfcp: Remove suspend callback
        [SCSI] zfcp: Remove global config_mutex
        [SCSI] zfcp: Replace local reference counting with common kref
        ...
      382f51fe
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 701791cc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: export clk_* symbols in clk.c
        m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.
        m68knommu: Move __init_end out of the .init section.
        m68knommu: Move __init_begin out of the .init section.
        m68knommu: Use more macros inside the .init section.
        m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.
        m68knommu: Make THREAD_SIZE available to assembly files.
        m68knommu: Don't hardcode the value of PAGE_SIZE in the linker script.
        m68knommu: rename BSS define in linker script
        m68knommu: add a task_pt_regs() macro
        m68knommu: define arch_has_single_step() and friends
        m68knommu: add uboot commandline argument passing support
        m68knommu: Coldfire GPIO corrections
        m68knommu: move mcf_remove to .devexit.text
      
      Fixed up (?) conflict in arch/m68k/include/asm/ptrace.h
      701791cc
    • Linus Torvalds's avatar
      4ba15259
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 3a43aaa3
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits)
        sh: include empty zero page in romImage
        sh: Make associative cache writes fatal on all SH-4A parts.
        sh: Drop associative writes for SH-4 cache flushes.
        sh: Partial revert of copy/clear_user_highpage() optimizations.
        sh: Add default uImage rule for se7724, ap325rxa, and migor.
        sh: allow runtime pm without suspend/resume callbacks
        sh: mach-ecovec24: Remove un-defined settings for VPU
        sh: mach-ecovec24: LCDC drive ability become high
        sh: fix sh7724 VEU3F resource size
        serial: sh-sci: Fix too early port disabling.
        sh: pfc: pr_info() -> pr_debug() cleanups.
        sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.
        sh: Improve kfr2r09 serial port setup code
        sh: Break out SuperH PFC code
        sh: Move KEYSC header file
        sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file
        sh: Add CPG save/restore code for sh7724 R-standby
        sh: Add SDHI power control support to Ecovec
        mfd: Add power control platform data to SDHI driver
        sh: mach-ecovec24: modify address map
        ...
      3a43aaa3
    • Linus Torvalds's avatar
      Merge branch 'davinci-for-linus' of... · aed886ce
      Linus Torvalds authored
      Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
      
      * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (69 commits)
        davinci: Initial support for Neuros OSD2 platform.
        davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
        davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
        DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
        DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
        davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
        davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
        davinci: DA850/OMAP-L138 EVM: register for cpuidle support
        davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
        davinci: add CPU idle driver
        davinci: DA8XX/OMAP-L1XX: fix compiler warning
        davinci: DA850/OMAP-L138: eliminate static function declaration
        davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
        davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
        davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
        davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
        davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
        davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
        davinci: DA830/OMAP-L137 EVM: fix warning with default config
        davinci: Add NAND support for DA830/OMAP-L137 EVM platform
        ...
      aed886ce
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 67dd2f5a
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
        [S390] 3215/3270 console: remove wrong comment
        [S390] dasd: remove BKL from extended error reporting code
        [S390] vmlogrdr: remove BKL
        [S390] vmur: remove BKL
        [S390] zcrypt: remove BKL
        [S390] 3270: remove BKL
        [S390] vmwatchdog: remove lock_kernel() from open() function
        [S390] monwriter: remove lock_kernel() from open() function
        [S390] monreader: remove lock_kernel() from open() function
        [S390] s390: remove unused nfsd #includes
        [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
        [S390] etr/stp: put correct per cpu variable
        [S390] tty3270: move keyboard compat ioctls
        [S390] sclp: improve servicability setting
        [S390] s390: use change recording override for kernel mapping
        [S390] MAINTAINERS: Add s390 drivers block
        [S390] use generic sockios.h header file
        [S390] use generic termbits.h header file
        [S390] smp: remove unused typedef and defines
        [S390] cmm: free pages on hibernate.
        ...
      67dd2f5a
    • Jean Delvare's avatar
      Doc: use misc-devices/ dir for drivers · 5327b9b8
      Jean Delvare authored
      We have a directory for misc drivers documentation, let's use it.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: "Darrick J. Wong" <djwong@us.ibm.com>
      Cc: Rodolfo Giometti <giometti@linux.it>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5327b9b8
    • Luis Garces-Erice's avatar
      Doc: better explanation of procs_running · e3cc2226
      Luis Garces-Erice authored
      the description in Documentation/filesystems/proc.txt of the
      procs_running entry in /proc/stat is confusing (according to that
      description, it looks as if procs_running could only be a number
      between 0 and the number of CPUs).
      
      Changed it to a more accurate description in the patch attached.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e3cc2226
    • Dominik D. Geyer's avatar
      correct gpio.txt typos · bfc9dcab
      Dominik D. Geyer authored
      Corrected sysfs gpio chip node name and fixed punctuation.
      Signed-off-by: default avatarDominik D. Geyer <dominik.geyer@gmx.de>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Cc: David Brownell <dbrownell@users.sourceforge.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      bfc9dcab
    • Shawn Bohrer's avatar
      docbook: fix signal_pending() argument · 2770f189
      Shawn Bohrer authored
      Since signal_pending() takes a task_struct pointer as an argument, update
      the example to pass in 'current'.
      Signed-off-by: default avatarShawn Bohrer <shawn.bohrer@gmail.com>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2770f189
    • Marin Mitov's avatar
      use DMA_BIT_MASK instead of inline constant · 038f7d00
      Marin Mitov authored
      Use DMA_BIT_MASK(24) instead of 0x00ffffff in DMA-mapping.txt
      Signed-off-by: default avatarMarin Mitov <mitov@issp.bas.bg>
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      038f7d00
    • Randy Dunlap's avatar
    • Frederic Weisbecker's avatar
      nvram: Fix missing smp_lock.h in nvram · 79a56ed0
      Frederic Weisbecker authored
      The bkl has been removed from nvram_llseek() and smp_lock.h was removed
      because another patch in the same tree zapped the remaining usage of bkl
      in the same file.  But this patch must have been excluded later, then we
      still need the smp_lock.h headers for the bkl use in nvram_open().
      
      This fixes the following build error:
      
        drivers/char/nvram.c: In function ‘nvram_open’:
        drivers/char/nvram.c:332: erreur: implicit declaration of function ‘lock_kernel’
        drivers/char/nvram.c:339: erreur: implicit declaration of function ‘unlock_kernel’
        make[2]: *** [drivers/char/nvram.o] Erreur 1
        make[1]: *** [drivers/char] Erreur 2
        make: *** [drivers] Erreur 2
      Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      79a56ed0
  2. 09 Dec, 2009 19 commits