1. 14 8月, 2010 11 次提交
  2. 13 8月, 2010 29 次提交
    • H
      [S390] partitions: fix build error in ibm partition detection code · 2041f657
      Heiko Carstens 提交于
      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 <adobriyan@gmail.com>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      2041f657
    • H
      [S390] appldata: fix dev_get_stats 64 bit conversion · e402e38c
      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 be1f3c2c
      "net: Enable 64-bit net device statistics on 32-bit architectures"
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      e402e38c
    • H
    • H
      [S390] zcrypt: fix Kconfig dependencies · 57a4955f
      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: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      57a4955f
    • H
      [S390] sys_personality: follow u_long to unsigned int conversion · 3a110370
      Heiko Carstens 提交于
      commit 485d5276 "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: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      3a110370
    • H
      [S390] dasd: fix format string types · 625c94df
      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: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      625c94df
    • L
      mm: keep a guard page below a grow-down stack segment · 320b2b8d
      Linus Torvalds 提交于
      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: NKeith Packard <keithp@keithp.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      320b2b8d
    • U
      ctcm: rename READ/WRITE defines to avoid redefinitions · 3c09e264
      Ursula Braun 提交于
      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: NUrsula Braun <ursula.braun@de.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3c09e264
    • H
      claw: rename READ/WRITE defines to avoid redefinitions · 319cb083
      Heiko Carstens 提交于
      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: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NUrsula Braun <ursula.braun@de.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      319cb083
    • L
      Revert "fsnotify: store struct file not struct path" · 2069601b
      Linus Torvalds 提交于
      This reverts commit 3bcf3860 (and the
      accompanying commit c1e5c954 "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: NLinus Torvalds <torvalds@linux-foundation.org>
      2069601b
    • I
      perf: Add back list_head data types · 88d89da6
      Ingo Molnar 提交于
      This commit:
      
       de5d9bf6: Move list types from <linux/list.h> to <linux/types.h>.
      
      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 <acme@redhat.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      LKML-Reference: <new-submission>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      88d89da6
    • I
      Merge branch 'linus' into perf/urgent · f46a6804
      Ingo Molnar 提交于
      Merge reason: Fix upstream breakage introduced by:
      
       de5d9bf6: Move list types from <linux/list.h> to <linux/types.h>.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      f46a6804
    • S
      [NFS] Set CONFIG_KEYS when CONFIG_NFS_USE_KERNEL_DNS is set · 3f432312
      Steve French 提交于
      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: NBryan Schumaker <bjschuma@netapp.com>
      CC: David Howells <dhowells@redhat.com>
      Signed-off-by: NSteve French <sfrench@us.ibm.com>
      3f432312
    • R
      V4L/DVB: v4l2-ctrls.c: needs to include slab.h · 2b80163c
      Randy Dunlap 提交于
      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: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      2b80163c
    • M
      V4L/DVB: fix Kconfig to depends on VIDEO_IR · 361be7b1
      Mauro Carvalho Chehab 提交于
      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: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      361be7b1
    • M
      V4L/DVB: Fix IR_CORE dependencies · cfec93f7
      Mauro Carvalho Chehab 提交于
      As pointed by Randy Dunlap <randy.dunlap@oracle.com>:
      > 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: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      cfec93f7
    • L
      Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris · ad41a1e0
      Linus Torvalds 提交于
      * 'io_remap_pfn_range' of git://www.jni.nu/cris:
        CRIS: Define io_remap_pfn_range as remap_pfn_range
      ad41a1e0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm · 8357422d
      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
        ...
      8357422d
    • L
      Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 · 1021a645
      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
      1021a645
    • L
      Merge branch 'for-linus' of git://neil.brown.name/md · 7367f5b0
      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.
      7367f5b0
    • L
      Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm · ce4327d3
      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 <linux/version.h>
      ce4327d3
    • L
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 4032816d
      Linus Torvalds 提交于
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] add missing __percpu markup in pcc-cpufreq.c
      4032816d
    • L
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 1c00650c
      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
      1c00650c
    • L
      Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 26df0766
      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.
        ...
      26df0766
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 · 58028762
      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.
        ...
      58028762
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · e83ddb33
      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
        ...
      e83ddb33
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 14a4fa20
      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
      14a4fa20
    • L
      Merge git://git.infradead.org/battery-2.6 · 16bb85bc
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        intel_mid_battery: Fix battery scaling
        intel_mid_battery: Fix the argument order to intel_scu_ipc_command
        olpc_battery: Fix build failure caused by sysfs changes
        Add s3c-adc-battery driver
        Intel MID platform battery driver
      
      Fix up trivial conflicts (battery drivers added from different branches)
      in drivers/power/{Kconfig,Makefile}
      16bb85bc
    • C
      x86/hpet: Use the FSEC_PER_SEC constant for femto-second periods · 4936a3b9
      Chris Wilson 提交于
      The current computation, introduced with f12a15be, of FSEC_PER_SEC using
      the multiplication of (FSEC_PER_NSEC * NSEC_PER_SEC) is performed only
      with 32bit integers on small machines, resulting in an overflow and a
      *very* short intervals being programmed.  An interrupt storm follows.
      
      Note that we also have to specify FSEC_PER_SEC as being long long to
      overcome the same limitations.
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: NJohn Stultz <johnstul@us.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Acked-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NH. Peter Anvin <hpa@zytor.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4936a3b9