1. 25 5月, 2011 28 次提交
  2. 24 5月, 2011 12 次提交
    • L
      Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · d762f438
      Linus Torvalds 提交于
      * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
        sh: Ignore R_SH_NONE module relocations.
        SH: SE7751: Fix pcibios_map_platform_irq prototype.
        sh: remove warning and warning_symbol from struct stacktrace_ops
        sh: wire up sys_sendmmsg.
        clocksource: sh_tmu: Runtime PM support
        clocksource: sh_tmu: __clocksource_updatefreq_hz() update
        clocksource: sh_cmt: Runtime PM support
        clocksource: sh_cmt: __clocksource_updatefreq_hz() update
        dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
        dmaengine: shdma: add runtime- and system-level power management
        dmaengine: shdma: fix locking
        sh: sh-sci: sh7377 and sh73a0 build fixes
        sh: cosmetic improvement: use an existing pointer
        serial: sh-sci: suspend/resume wakeup support V2
        serial: sh-sci: Runtime PM support
        sh: select IRQ_FORCED_THREADING.
        sh: intc: Set virtual IRQs as nothread.
        sh: fixup fpu.o compile order
        i2c: add a module alias to the sh-mobile driver
        ALSA: add a module alias to the FSI driver
        ...
      d762f438
    • L
      Merge branch 'perf-urgent-for-linus' of... · 52146383
      Linus Torvalds 提交于
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf tools: Fix sample type size calculation in 32 bits archs
        profile: Use vzalloc() rather than vmalloc() & memset()
      52146383
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · df462b3d
      Linus Torvalds 提交于
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
        [media] gspca - sunplus: Fix some warnings and simplify code
        [media] gspca: Fix some warnings tied to 'no debug'
        [media] gspca: Unset debug by default
        [media] gspca - cpia1: Remove a bad conditional compilation instruction
        [media] gspca - main: Remove USB traces
        [media] gspca - main: Version change to 2.13
        [media] gspca - stk014 / t613: Accept the index 0 in querymenu
        [media] gspca - kinect: Remove __devinitdata
        [media] gspca - cpia1: Fix some warnings
        [media] video/Kconfig: Fix mis-classified devices
        [media] support for medion dvb stick 1660:1921
        [media] tm6000: fix uninitialized field, change prink to dprintk
        [media] cx231xx: Add support for Iconbit U100
        [media] saa7134 add new TV cards
        [media] Use a more consistent value for RC repeat period
        [media] cx18: Move spinlock and vb_type initialisation into stream_init
        [media] tm6000: remove tm6010 sif audio start and stop
        [media] tm6000: remove unused exports
        [media] tm6000: add pts logging
        [media] tm6000: change from ioctl to unlocked_ioctl
        ...
      df462b3d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 · 343800e7
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
        fat: Fix statfs->f_namelen
        fat: Replace all printk with fat_msg()
        fat: Add fat_msg() function for preformated FAT messages
        fat: Convert fat_fs_error to use %pV
        fat: Fix possible null deref in fat_cache_add()
        fat: use new setup() for ->dir_ops too
      343800e7
    • G
      hwmon: (coretemp) Add comments describing the handling of HT CPUs · f4e0bcf0
      Guenter Roeck 提交于
      The coretemp driver provides a single set of device attributes for each
      physical core of a HT CPU to avoid duplicate sensors.  This
      functionality was introduced with commit d883b9f0 ("hwmon:
      (coretemp) Skip duplicate CPU entries").
      
      Commit e40cc4bd ("x86/hwmon: register alternate sibling upon CPU
      removal") extends this functionality to register the HT sibling of a CPU
      which is taken offline, to ensure that sensor attributes are provided if
      at least one HT sibling of a core is online.
      
      Add comments into the code describing the functionality in some more
      detail.
      Signed-off-by: NGuenter Roeck <guenter.roeck@ericsson.com>
      Cc: Fenghua Yu <fenghua.yu@intel.com>
      Cc: Durgadoss R <durgadoss.r@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f4e0bcf0
    • L
      kernel/watchdog.c: Use proper ANSI C prototypes · 5f2e8e2b
      Linus Torvalds 提交于
      We try to enforce it by using -Wstrict-prototypes, but apparently they
      sometimes get through.  Introduced by 4eec42f3 ("watchdog: Change
      the default timeout and configure nmi watchdog period based").
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5f2e8e2b
    • F
      perf tools: Fix sample type size calculation in 32 bits archs · 0f61f3e4
      Frederic Weisbecker 提交于
      The shift used here to count the number of bits set in
      the mask doesn't work above the low part for archs that
      are not 64 bits.
      
      Fix the constant used for the shift.
      
      This fixes a 32-bit perf top failure reported by Eric Dumazet:
      
      	Can't parse sample, err = -14
      	Can't parse sample, err = -14
      	...
      Reported-and-tested-by: NEric Dumazet <eric.dumazet@gmail.com>
      Signed-off-by: NFrederic Weisbecker <fweisbec@gmail.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Steven Rostedt <rostedt@goodmis.org>
      Cc: Eric Dumazet <eric.dumazet@gmail.com>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Stephane Eranian <eranian@google.com
      Link: http://lkml.kernel.org/r/1306200686-17317-1-git-send-email-fweisbec@gmail.comSigned-off-by: NIngo Molnar <mingo@elte.hu>
      0f61f3e4
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 5e152b4c
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
        PCI: Don't use dmi_name_in_vendors in quirk
        PCI: remove unused AER functions
        PCI/sysfs: move bus cpuaffinity to class dev_attrs
        PCI: add rescan to /sys/.../pci_bus/.../
        PCI: update bridge resources to get more big ranges when allocating space (again)
        KVM: Use pci_store/load_saved_state() around VM device usage
        PCI: Add interfaces to store and load the device saved state
        PCI: Track the size of each saved capability data area
        PCI/e1000e: Add and use pci_disable_link_state_locked()
        x86/PCI: derive pcibios_last_bus from ACPI MCFG
        PCI: add latency tolerance reporting enable/disable support
        PCI: add OBFF enable/disable support
        PCI: add ID-based ordering enable/disable support
        PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
        PCI: Set PCIE maxpayload for card during hotplug insertion
        PCI/ACPI: Report _OSC control mask returned on failure to get control
        x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
        PCI: handle positive error codes
        PCI: check pci_vpd_pci22_wait() return
        PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
        ...
      
      Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be
      moved the intel SMBUS ID definitons to the i2c-i801.c driver.
      5e152b4c
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · a77febbe
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: obey minleft values during extent allocation correctly
        xfs: reset buffer pointers before freeing them
        xfs: avoid getting stuck during async inode flushes
        xfs: fix xfs_itruncate_start tracing
        xfs: fix duplicate workqueue initialisation
        xfs: kill off xfs_printk()
        xfs: fix race condition in AIL push trigger
        xfs: make AIL target updates and compares 32bit safe.
        xfs: always push the AIL to the target
        xfs: exit AIL push work correctly when AIL is empty
        xfs: ensure reclaim cursor is reset correctly at end of AG
        xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE
        xfs: fix compiler warning in xfs_trace.h
        xfs: cleanup duplicate initializations
        xfs: reduce the number of pagb_lock roundtrips in xfs_alloc_clear_busy
        xfs: exact busy extent tracking
        xfs: do not immediately reuse busy extent ranges
        xfs: optimize AGFL refills
      a77febbe
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 42cd71bf
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (137 commits)
        ARM: bcmring: convert to use sp804 clockevents
        ARM: bcmring: convert to sp804 clocksource
        ARM: 6912/1: bcmring: Add clkdev table in init_early
        clockevents: ARM sp804: obtain sp804 timer rate via clks
        clockevents: ARM sp804: allow clockevent name to be specified
        clocksource: ARM sp804: obtain sp804 timer rate via clks
        clocksource: ARM sp804: allow clocksource name to be specified
        clocksource: convert OMAP1 to 32-bit down counting clocksource
        clocksource: convert MXS timrotv2 to 32-bit down counting clocksource
        clocksource: convert SPEAr platforms 16-bit up counting clocksource
        clocksource: convert Integrator/AP 16-bit down counting clocksource
        clocksource: convert W90x900 24-bit down counting clocksource
        clocksource: convert ARM 32-bit down counting clocksources
        clocksource: convert ARM 32-bit up counting clocksources
        clocksource: add common mmio clocksource
        ARM: update sa1100 to reflect PXA updates
        ARM: omap1: convert to using readl/writel instead of volatile struct
        ARM: omap1: delete useless interrupt handler
        ARM: s5p: consolidate selection of timer register
        ARM: 6939/1: fix missing 'cpu_relax()' declaration
        ...
      42cd71bf
    • V
      Documentation: update GregKH links · f5039935
      Vikram Narayanan 提交于
      Fixed the broken links in the SubmittingPatches file.
      
      [ The old links turn out to not be broken after all, but the new links
        are certainly more readable - Linus ]
      Signed-off-by: NVikram Narayanan <vikram186@gmail.com>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f5039935
    • N
      Documentation: fix vgaarbiter.txt typos etc. · f14d8d3a
      Nicolas Kaiser 提交于
      Fixed typos.
      
      v2: Incorporated changes by Randy Dunlap.
      Signed-off-by: NNicolas Kaiser <nikai@nikai.net>
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f14d8d3a