14 Aug, 2010

13 commits

  • The last user is gone, so we can safely remove this

    Signed-off-by: Arnd Bergmann
    Cc: John Kacur
    Cc: Al Viro
    Cc: Thomas Gleixner
    Signed-off-by: Frederic Weisbecker

    Arnd Bergmann
     
  • There are no more users of struct file_operations:ioctl. These
    can be safely removed.

    Signed-off-by: Frederic Weisbecker
    Cc: Arnd Bergmann
    Cc: Mauro Carvalho Chehab
    Cc: John Kacur
    Cc: Hans Verkuil

    Frederic Weisbecker
     
  • logfs does not need the BKL, so use ->unlocked_ioctl instead
    of ->ioctl in file operations.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Joern Engel
    [ fixed trivial conflict ]
    Signed-off-by: Frederic Weisbecker

    Arnd Bergmann
     
  • * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
    [S390] partitions: fix build error in ibm partition detection code
    [S390] appldata: fix dev_get_stats 64 bit conversion
    [S390] wire up prlimit64 and fanotify* syscalls
    [S390] zcrypt: fix Kconfig dependencies
    [S390] sys_personality: follow u_long to unsigned int conversion
    [S390] dasd: fix format string types

    Linus Torvalds
     
  • * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
    V4L/DVB: v4l2-ctrls.c: needs to include slab.h
    V4L/DVB: fix Kconfig to depends on VIDEO_IR
    V4L/DVB: Fix IR_CORE dependencies

    Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
    O2net: Disallow o2net accept connection request from itself.
    ocfs2/dlm: remove potential deadlock -V3
    ocfs2/dlm: avoid incorrect bit set in refmap on recovery master
    Fix the nested PR lock calling issue in ACL
    ocfs2: Count more refcount records in file system fragmentation.
    ocfs2 fix o2dlm dlm run purgelist (rev 3)
    ocfs2/dlm: fix a dead lock
    ocfs2: do not overwrite error codes in ocfs2_init_acl

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
    perf: Add back list_head data types
    perf ui hist browser: Fixup key bindings
    perf ui browser: Add ui_browser__show counterpart: __hide
    perf annotate: Cycle thru sorted lines with samples
    perf ui: Make SPACE work as PGDN in all browsers
    perf annotate: Sort by hottest lines in the TUI
    perf ui: Complete the breakdown of util/newt.c
    perf ui: Move hists browser to util/ui/browsers/
    perf symbols: Ignore mapping symbols on ARM
    perf ui: Move map browser to util/ui/browsers/
    perf ui: Move annotate browser to util/ui/browsers/
    perf ui: Move ui_progress routines to separate file in util/ui/
    perf ui: Move ui_helpline routines to separate file in util/ui/
    perf ui: Shorten ui_browser member names
    perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properly
    perf ui: Start breaking down newt.c into multiple files
    perf tui: Introduce list_head based generic ui_browser refresh routine
    perf probe: Fix memory leaks in add_perf_probe_events
    perf probe: Fix to copy the type for raw parameters
    perf report: Speed up exit path
    ...

    Linus Torvalds
     
  • * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, UV: Initialize BAU MMRs only on hubs with cpus
    x86, UV: Modularize BAU send and wait
    x86, UV: BAU broadcast to the local hub
    x86, UV: Correct BAU regular message type
    x86, UV: Remove BAU check for stay-busy
    x86, UV: Correct BAU discovery of hubs and sockets
    x86, UV: Correct BAU software acknowledge
    x86, UV: BAU structure rearranging
    x86, UV: Shorten access to BAU statistics structure
    x86, UV: Disable BAU on network congestion
    x86, UV: BAU tunables into a debugfs file
    x86, UV: Calculate BAU destination timeout

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
    ctcm: rename READ/WRITE defines to avoid redefinitions
    claw: rename READ/WRITE defines to avoid redefinitions
    phylib: available for any speed ethernet
    can: add limit for nframes and clean up signed/unsigned variables
    pkt_sched: Check .walk and .leaf class handlers
    pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
    caif-spi: Bugfix SPI_DATA_POS settings were inverted.
    caif: Bugfix - Increase default headroom size for control channel.
    net: make netpoll_rx return bool for !CONFIG_NETPOLL
    Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size
    Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
    Bluetooth: Change default L2CAP ERTM retransmit timeout
    Bluetooth: Fix endianness issue with L2CAP MPS configuration
    net: Use NET_XMIT_SUCCESS where possible.
    isdn: mISDN: call pci_disable_device() if pci_probe() failed
    isdn: avm: call pci_disable_device() if pci_probe() failed
    isdn: avm: call pci_disable_device() if pci_probe() failed
    usbnet: rx_submit() should return an error code.
    pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
    pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set
    AFS: Implement an autocell mount capability [ver #2]
    DNS: If the DNS server returns an error, allow that to be cached [ver #2]
    NFS: Use kernel DNS resolver [ver #2]
    cifs: update README to include details about 'fsc' option

    Linus Torvalds
     
  • * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, asm: Use a lower case name for the end macro in atomic64_386_32.S
    x86, asm: Refactor atomic64_386_32.S to support old binutils and be cleaner
    x86: Document __phys_reloc_hide() usage in __pa_symbol()
    x86, apic: Map the local apic when parsing the MP table.

    Linus Torvalds
     
  • It's wrong for several reasons, but the most direct one is that the
    fault may be for the stack accesses to set up a previous SIGBUS. When
    we have a kernel exception, the kernel exception handler does all the
    fixups, not some user-level signal handler.

    Even apart from the nested SIGBUS issue, it's also wrong to give out
    kernel fault addresses in the signal handler info block, or to send a
    SIGBUS when a system call already returns EFAULT.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • .. which didn't show up in my tests because it's a no-op on x86-64 and
    most other architectures. But we enter the function with the last-level
    page table mapped, and should unmap it at exit.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     

13 Aug, 2010

27 commits

  • 9c867fbe "partitions: fix sometimes unreadable partition strings" coverted
    one line within the ibm partition code incorrectly. Fix this to get rid of
    a build error.

    fs/partitions/ibm.c: In function 'ibm_partition':
    [...]
    fs/partitions/ibm.c:185: error: too many arguments to function 'strlcat'

    Cc: Alexey Dobriyan
    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • Fix this warning:

    arch/s390/appldata/appldata_net_sum.c: In function 'appldata_get_net_sum_data':
    arch/s390/appldata/appldata_net_sum.c:89: warning: initialization from incompatible pointer type

    which was introduced with be1f3c2c027cc5ad735df6a45a542ed1db7ec48b
    "net: Enable 64-bit net device statistics on 32-bit architectures"

    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • warning: (ZCRYPT && CRYPTO && CRYPTO_HW && S390 && ZCRYPT=y) selects
    ZCRYPT_MONOLITHIC which has unmet direct dependencies (ZCRYPT=m)

    ZCRYPT_MONOLITHIC should not depend on ZCRYPT="m" when it gets
    selected if ZCRYPT="y".

    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • commit 485d527686850d68a0e9006dd9904f19f122485e "sys_personality: change
    sys_personality() to accept "unsigned int" instead of u_long" changed
    the syscall interface for sys_personality.
    Just follow the common code change in our arch code to avoid confusion.

    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • Get rid of these warnings:

    drivers/s390/block/dasd.c: In function '__dasd_device_check_expire':
    drivers/s390/block/dasd.c:1330: warning: format '%i' expects type 'int', but argument 4 has type 'long unsigned int'
    drivers/s390/block/dasd.c:1337: warning: format '%i' expects type 'int', but argument 4 has type 'long unsigned int'

    Signed-off-by: Heiko Carstens
    Signed-off-by: Martin Schwidefsky

    Heiko Carstens
     
  • This is a rather minimally invasive patch to solve the problem of the
    user stack growing into a memory mapped area below it. Whenever we fill
    the first page of the stack segment, expand the segment down by one
    page.

    Now, admittedly some odd application might _want_ the stack to grow down
    into the preceding memory mapping, and so we may at some point need to
    make this a process tunable (some people might also want to have more
    than a single page of guarding), but let's try the minimal approach
    first.

    Tested with trivial application that maps a single page just below the
    stack, and then starts recursing. Without this, we will get a SIGSEGV
    _after_ the stack has smashed the mapping. With this patch, we'll get a
    nice SIGBUS just as the stack touches the page just above the mapping.

    Requested-by: Keith Packard
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • READ/WRITE seems to be a bit too generic for defines in a device
    driver. Just rename them to CTCM_READ/CTCM_WRITE to avoid warnings.

    Signed-off-by: Ursula Braun
    Signed-off-by: David S. Miller

    Ursula Braun
     
  • READ/WRITE seems to be a bit too generic for defines in a device driver.
    Just rename them to READ_CHANNEL/WRITE_CHANNEL which should suffice.

    Fixes this:

    In file included from drivers/s390/net/claw.c:93:
    drivers/s390/net/claw.h:78:1: warning: "WRITE" redefined
    In file included from /home2/heicarst/linux-2.6/arch/s390/include/asm/debug.h:12,
    from drivers/s390/net/claw.c:68:
    include/linux/fs.h:156:1: warning: this is the location of the previous definition

    Signed-off-by: Heiko Carstens
    Signed-off-by: Ursula Braun
    Signed-off-by: David S. Miller

    Heiko Carstens
     
  • This reverts commit 3bcf3860a4ff9bbc522820b4b765e65e4deceb3e (and the
    accompanying commit c1e5c954020e "vfs/fsnotify: fsnotify_close can delay
    the final work in fput" that was a horribly ugly hack to make it work at
    all).

    The 'struct file' approach not only causes that disgusting hack, it
    somehow breaks pulseaudio, probably due to some other subtlety with
    f_count handling.

    Fix up various conflicts due to later fsnotify work.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • This commit:

    de5d9bf: Move list types from to .

    Moved the list head data types out of list.h, breaking the build.
    Add them to the perf types.h as well.

    Cc: Arnaldo Carvalho de Melo
    Cc: Peter Zijlstra
    Cc: Frederic Weisbecker
    Cc: Paul Mackerras
    Cc: Steven Rostedt
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Merge reason: Fix upstream breakage introduced by:

    de5d9bf: Move list types from to .

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     
  • Previous patch relied on DNS_RESOLVER setting CONFIG_KEYS
    but needs to be selected in NFS config when using the new
    DNS resolver

    Signed-off-by: Bryan Schumaker
    CC: David Howells
    Signed-off-by: Steve French

    Steve French
     
  • v4l2-ctrls.c needs to include slab.h to prevent build errors:

    drivers/media/video/v4l2-ctrls.c:766: error: implicit declaration of function 'kzalloc'
    drivers/media/video/v4l2-ctrls.c:786: error: implicit declaration of function 'kfree'
    drivers/media/video/v4l2-ctrls.c:1528: error: implicit declaration of function 'kmalloc'

    Signed-off-by: Randy Dunlap
    Signed-off-by: Mauro Carvalho Chehab

    Randy Dunlap
     
  • warning: (VIDEO_BT848 && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT || VIDEO_SAA7134 && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && VIDEO_DEV && PCI && I2C && INPUT || VIDEO_CX88 && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && VIDEO_DEV && PCI && I2C && INPUT || VIDEO_IVTV && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && PCI && I2C && INPUT || VIDEO_CX18 && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && DVB_CORE && PCI && I2C && EXPERIMENTAL && INPUT || VIDEO_EM28XX && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && V4L_USB_DRIVERS && USB && VIDEO_DEV && I2C && INPUT || VIDEO_TLG2300 && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && V4L_USB_DRIVERS && USB && VIDEO_DEV && I2C && INPUT && SND && DVB_CORE || VIDEO_CX231XX && MEDIA_SUPPORT && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 && V4L_USB_DRIVERS && USB && VIDEO_DEV && I2C && INPUT || DVB_BUDGET_CI && MEDIA_SUPPORT && DVB_CAPTURE_DRIVERS && DVB_CORE && DVB_BUDGET_CORE && I2C && INPUT || DVB_DM1105 && MEDIA_SUPPORT && DVB_CAPTURE_DRIVERS && DVB_CORE && PCI && I2C && INPUT || VIDEO_GO7007 && STAGING && !STAGING_EXCLUDE_BUILD && VIDEO_DEV && PCI && I2C && INPUT && SND || VIDEO_CX25821 && STAGING && !STAGING_EXCLUDE_BUILD && DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT) selects VIDEO_IR which has unmet direct dependencies (IR_CORE)

    Acked-by: Randy Dunlap
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • As pointed by Randy Dunlap :
    > ERROR: "ir_keydown" [drivers/media/video/ir-kbd-i2c.ko] undefined!
    > ERROR: "__ir_input_register" [drivers/media/video/ir-kbd-i2c.ko] undefined!
    > ERROR: "get_rc_map" [drivers/media/video/ir-kbd-i2c.ko] undefined!
    > ERROR: "ir_input_unregister" [drivers/media/video/ir-kbd-i2c.ko] undefined!
    > ERROR: "get_rc_map" [drivers/media/video/cx88/cx88xx.ko] undefined!
    > ERROR: "ir_repeat" [drivers/media/video/cx88/cx88xx.ko] undefined!
    > ERROR: "ir_input_unregister" [drivers/media/video/cx88/cx88xx.ko] undefined!
    > ERROR: "ir_keydown" [drivers/media/video/cx88/cx88xx.ko] undefined!
    > ERROR: "__ir_input_register" [drivers/media/video/cx88/cx88xx.ko] undefined!
    > ERROR: "get_rc_map" [drivers/media/video/bt8xx/bttv.ko] undefined!
    > ERROR: "ir_input_unregister" [drivers/media/video/bt8xx/bttv.ko] undefined!
    > ERROR: "__ir_input_register" [drivers/media/video/bt8xx/bttv.ko] undefined!
    > ERROR: "ir_g_keycode_from_table" [drivers/media/IR/ir-common.ko] undefined!
    >
    >
    > #5101:
    > (.text+0x8306e2): undefined reference to `ir_core_debug'
    > (.text+0x830729): undefined reference to `ir_core_debug'
    > ir-functions.c:(.text+0x830906): undefined reference to `ir_core_debug'
    > (.text+0x8309d8): undefined reference to `ir_g_keycode_from_table'
    > (.text+0x830acf): undefined reference to `ir_core_debug'
    > (.text+0x830b92): undefined reference to `ir_core_debug'
    > (.text+0x830bef): undefined reference to `ir_core_debug'
    > (.text+0x830c6a): undefined reference to `ir_core_debug'
    > (.text+0x830cf7): undefined reference to `ir_core_debug'
    > budget-ci.c:(.text+0x89f5c8): undefined reference to `ir_keydown'
    > budget-ci.c:(.text+0x8a0c58): undefined reference to `get_rc_map'
    > budget-ci.c:(.text+0x8a0c80): undefined reference to `__ir_input_register'
    > budget-ci.c:(.text+0x8a0ee0): undefined reference to `get_rc_map'
    > budget-ci.c:(.text+0x8a11cd): undefined reference to `ir_input_unregister'
    > (.text+0x8a8adb): undefined reference to `ir_input_unregister'
    > dvb-usb-remote.c:(.text+0x8a9188): undefined reference to `get_rc_map'
    > dvb-usb-remote.c:(.text+0x8a91b1): undefined reference to `__ir_input_register'
    > dvb-usb-remote.c:(.text+0x8a9238): undefined reference to `get_rc_map'
    > dib0700_core.c:(.text+0x8b04ca): undefined reference to `ir_keydown'
    > dib0700_devices.c:(.text+0x8b2ea8): undefined reference to `ir_keydown'
    > dib0700_devices.c:(.text+0x8b2ef0): undefined reference to `ir_keydown'

    Those breakages seem to be caused by two bad things at IR_CORE Kconfig:

    1) cx23885 is using select for IR_CORE;
    2) the dvb-usb and sms dependency for IR_CORE were missing.

    While here, allow users to un-select IR.

    Acked-by: Randy Dunlap
    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     
  • * 'io_remap_pfn_range' of git://www.jni.nu/cris:
    CRIS: Define io_remap_pfn_range as remap_pfn_range

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (33 commits)
    dm mpath: support discard
    dm stripe: support discards
    dm: split discard requests on target boundaries
    dm stripe: optimize sector division
    dm stripe: move sector translation to a function
    dm: error return error for discards
    dm delay: support discard
    dm: zero silently drop discards
    dm: use dm_target_offset macro
    dm: factor out max_io_len_target_boundary
    dm: use common __issue_target_request for flush and discard support
    dm: linear support discard
    dm crypt: simplify crypt_ctr
    dm crypt: simplify crypt_config destruction logic
    dm: allow autoloading of dm mod
    dm: rename map_info flush_request to target_request_nr
    dm ioctl: refactor dm_table_complete
    dm snapshot: implement merge
    dm: do not initialise full request queue when bio based
    dm ioctl: make bio or request based device type immutable
    ...

    Linus Torvalds
     
  • * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
    hugetlb: add missing unlock in avoidcopy path in hugetlb_cow()
    hwpoison: rename CONFIG
    HWPOISON, hugetlb: support hwpoison injection for hugepage
    HWPOISON, hugetlb: detect hwpoison in hugetlb code
    HWPOISON, hugetlb: isolate corrupted hugepage
    HWPOISON, hugetlb: maintain mce_bad_pages in handling hugepage error
    HWPOISON, hugetlb: set/clear PG_hwpoison bits on hugepage
    HWPOISON, hugetlb: enable error handling path for hugepage
    hugetlb, rmap: add reverse mapping for hugepage
    hugetlb: move definition of is_vm_hugetlb_page() to hugepage_inline.h

    Fix up trivial conflicts in mm/memory-failure.c

    Linus Torvalds
     
  • * 'for-linus' of git://neil.brown.name/md:
    Further tidyup of raid6 naming in lib/raid6
    Make lib/raid6/test build correctly.
    Rename raid6 files now they're in a 'raid6' directory.

    Linus Torvalds
     
  • * 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
    msm: mmc: Add msm prefix to platform data structure
    msm: trout: Remove extern declaration from source file
    arm: msm: Fix section mismatch in smd.c.
    arm: msm: trout add mmc support
    arm: msm: trout: add trout specific gpio interrupts
    arm: msm: remove unused #include

    Linus Torvalds
     
  • * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
    [CPUFREQ] add missing __percpu markup in pcc-cpufreq.c

    Linus Torvalds
     
  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c: I2C bus multiplexer driver pca954x
    i2c: Multiplexed I2C bus core support
    i2c: Use a separate mutex for userspace client lists
    i2c: Make i2c_default_probe self-sufficient
    i2c: Drop dummy variable
    i2c: Move adapter locking helpers to i2c-core
    V4L/DVB: Use custom I2C probing function mechanism
    i2c: Add support for custom probe function
    i2c-dev: Use memdup_user
    i2c-dev: Remove unnecessary kmalloc casts

    Linus Torvalds
     
  • * 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (22 commits)
    param: don't deref arg in __same_type() checks
    param: update drivers/acpi/debug.c to new scheme
    param: use module_param in drivers/message/fusion/mptbase.c
    ide: use module_param_named rather than module_param_call
    param: update drivers/char/ipmi/ipmi_watchdog.c to new scheme
    param: lock if_sdio's lbs_helper_name and lbs_fw_name against sysfs changes.
    param: lock myri10ge_fw_name against sysfs changes.
    param: simple locking for sysfs-writable charp parameters
    param: remove unnecessary writable charp
    param: add kerneldoc to moduleparam.h
    param: locking for kernel parameters
    param: make param sections const.
    param: use free hook for charp (fix leak of charp parameters)
    param: add a free hook to kernel_param_ops.
    param: silence .init.text references from param ops
    Add param ops struct for hvc_iucv driver.
    nfs: update for module_param_named API change
    AppArmor: update for module_param_named API change
    param: use ops in struct kernel_param, rather than get and set fns directly
    param: move the EXPORT_SYMBOL to after the definitions.
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (22 commits)
    regulator: Remove default DEBUG define from TPS6586x
    regulator: tps6507x - add missing platform_set_drvdata in tps6507x_pmic_probe
    regulator: tps6586x - add regulator_unregister() in tps6586x_regulator_remove()
    mfd: max8998 - fix incorrect kfree(i2c) in i2c_driver probe callback handler
    regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
    regulator: max8660 - fix a memory leak in max8660_remove()
    regulator: max1586 - fix a memory leak in max1586_pmic_remove()
    regulator: Default GPIO controlled WM8994 regulators to disabled
    regulator: lp3971 - remove unnecessary ret value checking in lp3971_i2c_write()
    max8998: fix off-by-one value range checking
    regulator: tps6586x: fix millivolt return values and SM2 table
    regulator: tps6586x: add dependancy on MFD_TPS6585x
    regulator: add TPS6586X regulator driver
    regulator: MAX8998: set_voltage bugfix. ramp_up delay and min/max voltage
    regulator: add support for regulators on the ab8500 MFD
    ab8500-mfd: add regulator support to ab8500 mfd device
    tps65023: Allow registering similar TPS65021
    drivers: regulators: depend on MFD_MAX8998
    drivers: regulator: add Maxim 8998 driver
    ISL6271A voltage regulator support.
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (40 commits)
    mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe
    mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
    mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe
    mfd: Add TPS6586x driver
    mfd: Use macros instead of some constant magic numbers for menelaus
    mfd: Fix menelaus mmc slot 2 misconfiguration
    mfd: Missing slab.h includes
    mfd: Fix wrong wm8350-core kfree in error path
    mfd: Fix wm8994_device_init() return value
    mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path
    mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit
    mfd: Fix tc6387xb resource reclaim
    mfd: Fix wrong goto labels for tc6393xb error handling
    mfd: Get rid of now unused mc13783 private header
    hwmon: Don't access struct mc13783 directly from mc13783-adc
    mfd: New mc13783 function exposing flags
    mfd: Check jz4740-adc kmalloc() result
    mfd: Fix jz4740-adc resource reclaim in probe error path
    mfd: Add WM8321 support
    mfd: Add stmpe auto sleep feature
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ASoC: add AD1980 obsolete information
    ASoC: register cache should be 1 byte aligned for 1 byte long register
    ALSA: hda - Adding support for new IDT 92HD87XX codecs
    ASoC: Fix inverted mute controls for WM8580
    ALSA: HDA: Use model=auto for LG R510
    ALSA: hda - Update model entries in HD-Audio-Models.txt
    ALSA: hda: document VIA models
    ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
    ALSA: hda - add support for Conexant CX20584
    ALSA: hda - New snd-hda-intel model/pin config for hp dv7-4000
    ALSA: hda - Fix missing stream for second ADC on Realtek ALC260 HDA codec
    ALSA: hda - Make converter setups sticky
    ALSA: hda - Add support for Acer ZGA ALC271 (1025:047c)
    sound/oss: Adjust confusing if indentation
    sound: oss: au1550_ac97.c removed duplicated #include
    ASoC: Fix for changed Eureka Kconfig symbol names

    Linus Torvalds