1. 17 Apr, 2013 9 commits
  2. 01 Apr, 2013 23 commits
  3. 30 Mar, 2013 1 commit
  4. 25 Mar, 2013 2 commits
    • Anton Vorontsov's avatar
      Merge branch 'urgent' · 6e997bb8
      Anton Vorontsov authored
      Conflicts:
      	drivers/power/pm2301_charger.c
      6e997bb8
    • Lars-Peter Clausen's avatar
      pm2301_charger: Remove __dev* annotations · 92413a9b
      Lars-Peter Clausen authored
      The removal of __devinit and friends seems to have overlapped with the
      addition of the pm2301_charger driver. Currently the driver fails to build
      with the following errors:
      
      	drivers/power/pm2301_charger.c:843:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_probe'
      	drivers/power/pm2301_charger.c:1013:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'pm2xxx_wall_charger_remove'
      	drivers/power/pm2301_charger.c:1049:11: error: 'pm2xxx_wall_charger_probe' undeclared here (not in a function)
      	drivers/power/pm2301_charger.c:1050:2: error: implicit declaration of function '__devexit_p'
      	drivers/power/pm2301_charger.c:1050:24: error: 'pm2xxx_wall_charger_remove' undeclared here (not in a function)
      
      This patch removes the __dev* annotations, which fixes the build errors.
      
      Cc: Lee Jones <lee.jones@linaro.org>
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
      92413a9b
  5. 23 Mar, 2013 5 commits
    • Linus Torvalds's avatar
      Linux 3.9-rc4 · 8bb96604
      Linus Torvalds authored
      8bb96604
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a607a114
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "These are mostly minor fixes this time around.  The iscsi-target CHAP
        big-endian bugfix and bump FD_MAX_SECTORS=2048 default patch to allow
        1MB sized I/Os for FILEIO backends on >= v3.5 code are both CC'ed to
        stable.
      
        Also, there is a persistent reservations regression that has recently
        been reported for >= v3.8.x code, that is currently being tracked down
        for v3.9."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target/pscsi: Reject cross page boundary case in pscsi_map_sg
        target/file: Bump FD_MAX_SECTORS to 2048 to handle 1M sized I/Os
        tcm_vhost: Flush vhost_work in vhost_scsi_flush()
        tcm_vhost: Add missed lock in vhost_scsi_clear_endpoint()
        target: fix possible memory leak in core_tpg_register()
        target/iscsi: Fix mutual CHAP auth on big-endian arches
        target_core_sbc: use noop for SYNCHRONIZE_CACHE
      a607a114
    • Linus Torvalds's avatar
      Merge tag 'md-3.9-fixes' of git://neil.brown.name/md · 22c3f2ff
      Linus Torvalds authored
      Pull md fixes from NeilBrown:
       "A few bugfixes for md
      
         - recent regressions in raid5
         - recent regressions in dmraid
         - a few instances of CONFIG_MULTICORE_RAID456 linger
      
        Several tagged for -stable"
      
      * tag 'md-3.9-fixes' of git://neil.brown.name/md:
        md: remove CONFIG_MULTICORE_RAID456 entirely
        md/raid5: ensure sync and DISCARD don't happen at the same time.
        MD: Prevent sysfs operations on uninitialized kobjects
        MD RAID5: Avoid accessing gendisk or queue structs when not available
        md/raid5: schedule_construction should abort if nothing to do.
      22c3f2ff
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · c8c1f167
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
       "Simple stuff.  See one-line summaries."
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        pata_samsung_cf: use module_platform_driver_probe()
        [libata] Avoid specialized TLA's in ZPODD's Kconfig
        libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
        sata_fsl: Remove redundant NULL check before kfree
        ahci: Add Device IDs for Intel Wellsburg PCH
        ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
      c8c1f167
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · df2a8f39
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "One bugfix for the tegra driver.  Two updates regarding email
        addresses and MAINTAINERS which I like to have up-to-date so people
        can be reached immediately.  While we are here, there is on PCI_ID
        addition."
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        MAINTAINERS: add maintainer entry for atmel i2c driver
        i2c: Fix my e-mail address in drivers and documentation
        i2c: iSMT: add Intel Avoton DeviceIDs
        i2c: tegra: check the clk_prepare_enable() return value
      df2a8f39