1. 02 11月, 2011 9 次提交
    • L
      Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc · 68e24ba7
      Linus Torvalds 提交于
      * 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits)
        ARM: pxa/cm-x300: properly set bt_reset pin
        ARM: mmp: rename SHEEVAD to GPLUGD
        ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
        ARM: i.MX28: shift frac value in _CLK_SET_RATE
        plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
        ARM: mx5: fix clock usage for suspend
        ARM: pxa: use correct __iomem annotations
        ARM: pxa: sharpsl pm needs SPI
        ARM: pxa: centro and treo680 need palm27x
        ARM: pxa: make pxafb_smart_*() empty when not enabled
        ARM: pxa: select POWER_SUPPLY on raumfeld
        ARM: pxa: pxa95x is incompatible with earlier pxa
        ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ
        ARM: pxa: pxa95x/saarb depends on pxa3xx code
        ARM: pxa: allow selecting just one of TREO680/CENTRO
        ARM: pxa: export symbols from pxa3xx-ulpi
        ARM: pxa: make zylonite_pxa*_init declaration match code
        ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
        ARM: at91: add defconfig for at91sam9g45 family
        ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig
        ...
      68e24ba7
    • L
      Merge branch 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux · b4beb4bf
      Linus Torvalds 提交于
      * 'for-linus/i2c-3.2' of git://git.fluff.org/bjdooks/linux: (47 commits)
        i2c-s3c2410: Add device tree support
        i2c-s3c2410: Keep a copy of platform data and use it
        i2c-nomadik: cosmetic coding style corrections
        i2c-au1550: dev_pm_ops conversion
        i2c-au1550: increase timeout waiting for master done
        i2c-au1550: remove unused ack_timeout
        i2c-au1550: remove usage of volatile keyword
        i2c-tegra: __iomem annotation fix
        i2c-eg20t: Add initialize processing in case i2c-error occurs
        i2c-eg20t: Fix flag setting issue
        i2c-eg20t: add stop sequence in case wait-event timeout occurs
        i2c-eg20t: Separate error processing
        i2c-eg20t: Fix 10bit access issue
        i2c-eg20t: Modify returned value s32 to long
        i2c-eg20t: Fix bus-idle waiting issue
        i2c-designware: Fix PCI core warning on suspend/resume
        i2c-designware: Add runtime power management support
        i2c-designware: Add support for Designware core behind PCI devices.
        i2c-designware: Push all register reads/writes into the core code.
        i2c-designware: Support multiple cores using same ISR
        ...
      b4beb4bf
    • L
      Merge branch 'for-linus' of git://opensource.wolfsonmicro.com/regulator · f3c3f067
      Linus Torvalds 提交于
      * 'for-linus' of git://opensource.wolfsonmicro.com/regulator: (22 commits)
        regulator: Constify constraints name
        regulator: Fix possible nullpointer dereference in regulator_enable()
        regulator: gpio-regulator add dependency on GENERIC_GPIO
        regulator: Add module.h include to gpio-regulator
        regulator: Add driver for gpio-controlled regulators
        regulator: remove duplicate REG_CTRL2 defines in tps65023
        regulator: Clarify documentation for regulator-regulator supplies
        regulator: Fix some bitrot in the machine driver documentation
        regulator: tps65023: Added support for the similiar TPS65020 chip
        regulator: tps65023: Setting correct core regulator for tps65021
        regulator: tps65023: Set missing bit for update core-voltage
        regulator: tps65023: Fixes i2c configuration issues
        regulator: Add debugfs file showing the supply map table
        regulator: tps6586x: add SMx slew rate setting
        regulator: tps65023: Fixes i2c configuration issues
        regulator: tps6507x: Remove num_voltages array
        regulator: max8952: removed unused mutex.
        regulator: fix regulator/consumer.h kernel-doc warning
        regulator: Ensure enough enable time for max8649
        regulator: 88pm8607: Fix off-by-one value range checking in the case of no id is matched
        ...
      f3c3f067
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · c18ae42a
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: ohci: fix isochronous DMA synchronization
        firewire: ohci: work around selfID junk due to wrong gap count
        firewire: net: Use posted writes
        firewire: use clamp and min3 macros
        firewire: ohci: optimize TSB41BA3D detection
        firewire: ohci: TSB41BA3D support tweaks
        firewire: ohci: Add support for TSB41BA3D phy
        firewire: ohci: Move code from the bus reset tasklet into a workqueue
        firewire: sbp2: fold two functions into one
        firewire: sbp2: move some code to more sensible places
        firewire: sbp2: remove obsolete reference counting
      c18ae42a
    • L
      Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 1c398651
      Linus Torvalds 提交于
      * 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: make pstore write function return normal success/fail value
        pstore: change mutex locking to spin_locks
        pstore: defer inserting OOPS entries into pstore
      1c398651
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f470f8d4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)
        mlx4_core: Deprecate log_num_vlan module param
        IB/mlx4: Don't set VLAN in IBoE WQEs' control segment
        IB/mlx4: Enable 4K mtu for IBoE
        RDMA/cxgb4: Mark QP in error before disabling the queue in firmware
        RDMA/cxgb4: Serialize calls to CQ's comp_handler
        RDMA/cxgb3: Serialize calls to CQ's comp_handler
        IB/qib: Fix issue with link states and QSFP cables
        IB/mlx4: Configure extended active speeds
        mlx4_core: Add extended port capabilities support
        IB/qib: Hold links until tuning data is available
        IB/qib: Clean up checkpatch issue
        IB/qib: Remove s_lock around header validation
        IB/qib: Precompute timeout jiffies to optimize latency
        IB/qib: Use RCU for qpn lookup
        IB/qib: Eliminate divide/mod in converting idx to egr buf pointer
        IB/qib: Decode path MTU optimization
        IB/qib: Optimize RC/UC code by IB operation
        IPoIB: Use the right function to do DMA unmap pages
        RDMA/cxgb4: Use correct QID in insert_recv_cqe()
        RDMA/cxgb4: Make sure flush CQ entries are collected on connection close
        ...
      f470f8d4
    • R
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib',... · 504255f8
      Roland Dreier 提交于
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next
      504255f8
    • L
      Merge git://github.com/herbertx/crypto · dc47d381
      Linus Torvalds 提交于
      * git://github.com/herbertx/crypto: (48 commits)
        crypto: user - Depend on NET instead of selecting it
        crypto: user - Add dependency on NET
        crypto: talitos - handle descriptor not found in error path
        crypto: user - Initialise match in crypto_alg_match
        crypto: testmgr - add twofish tests
        crypto: testmgr - add blowfish test-vectors
        crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT
        crypto: twofish-x86_64-3way - fix ctr blocksize to 1
        crypto: blowfish-x86_64 - fix ctr blocksize to 1
        crypto: whirlpool - count rounds from 0
        crypto: Add userspace report for compress type algorithms
        crypto: Add userspace report for cipher type algorithms
        crypto: Add userspace report for rng type algorithms
        crypto: Add userspace report for pcompress type algorithms
        crypto: Add userspace report for nivaead type algorithms
        crypto: Add userspace report for aead type algorithms
        crypto: Add userspace report for givcipher type algorithms
        crypto: Add userspace report for ablkcipher type algorithms
        crypto: Add userspace report for blkcipher type algorithms
        crypto: Add userspace report for ahash type algorithms
        ...
      dc47d381
    • E
      sysfs: Make sysfs_rename safe with sysfs_dirents in rbtrees. · f6d90b4f
      Eric W. Biederman 提交于
      In sysfs_rename we need to remove the optimization of not calling
      sysfs_unlink_sibling and sysfs_link_sibling if the renamed parent
      directory is not changing.  This optimization is no longer valid now
      that sysfs dirents are stored in an rbtree sorted by name.
      
      Move the assignment of s_ns before the call of sysfs_link_sibling.  With
      no sysfs_dirent fields changing after the call of sysfs_link_sibling
      this allows sysfs_link_sibling to take any of the directory entries into
      account when it builds the rbtrees, and s_ns looks like a prime canidate
      to be used in the rbtree in the future.
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Cc: Jiri Slaby <jirislaby@gmail.com>
      Cc: Greg KH <gregkh@suse.de>
      Cc: David Miller <davem@davemloft.net>
      Cc: Mikulas Patocka <mpatocka@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f6d90b4f
  2. 01 11月, 2011 31 次提交