Permalink
Switch branches/tags
Commits on May 20, 2010
  1. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
      Input: psmouse - small formatting changes to better follow coding style
      Input: synaptics - set dimensions as reported by firmware
      Input: elantech - relax signature checks
      Input: elantech - enforce common prefix on messages
      Input: wistron_btns - switch to using kmemdup()
      Input: usbtouchscreen - switch to using kmemdup()
      Input: do not force selecting i8042 on Moorestown
      Input: Documentation/sysrq.txt - update KEY_SYSRQ info
      Input: 88pm860x_onkey - remove invalid irq number assignment
      Input: i8042 - add a PNP entry to the aux device list
      Input: i8042 - add some extra PNP keyboard types
      Input: wm9712 - fix wm97xx_set_gpio() logic
      Input: add keypad driver for keys interfaced to TCA6416
      Input: remove obsolete {corgi,spitz,tosa}kbd.c
      Input: kbtab - do not advertise unsupported events
      Input: kbtab - simplify kbtab_disconnect()
      Input: kbtab - fix incorrect size parameter in usb_buffer_free
      Input: acecad - don't advertise mouse events
      Input: acecad - fix some formatting issues
      Input: acecad - simplify usb_acecad_disconnect()
      ...
    
    Trivial conflict in Documentation/feature-removal-schedule.txt
  2. Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds committed May 20, 2010
    …t/lenb/linux-acpi-2.6
    
    * 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (22 commits)
      ACPI: fix early DSDT dmi check warnings on ia64
      ACPICA: Update version to 20100428.
      ACPICA: Update/clarify some parameter names associated with acpi_handle
      ACPICA: Rename acpi_ex_system_do_suspend->acpi_ex_system_do_sleep
      ACPICA: Prevent possible allocation overrun during object copy
      ACPICA: Split large file, evgpeblk
      ACPICA: Add GPE support for dynamically loaded ACPI tables
      ACPICA: Clarify/rename some root table descriptor fields
      ACPICA: Update version to 20100331.
      ACPICA: Minimize the differences between linux GPE code and ACPICA code base
      ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT
      ACPICA: Update DSDT copy/detection.
      ACPICA: Add subsystem option to force copy of DSDT to local memory
      ACPICA: Add detection of corrupted/replaced DSDT
      ACPICA: Add write support for DataTable operation regions
      ACPICA: Fix for acpi_reallocate_root_table for incorrect root table copy
      ACPICA: Update comments/headers, no functional change
      ACPICA: Update version to 20100304
      ACPICA: Fix for possible fault in acpi_ex_release_mutex
      ACPICA: Standardize integer output for ACPICA warnings/errors
      ...
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits)
      ALSA: hda: Storage class should be before const qualifier
      ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies
      ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT
      ASoC: sdp4430 - add sdp4430 pcm ops to DAI.
      ASoC: TWL6040: Enable earphone path in codec
      ASoC: SDP4430: Add support for Earphone speaker
      ASoC: SDP4430: Add sdp4430 machine driver
      ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF
      ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function
      ALSA: sound/pci/asihpi: Use kzalloc
      ALSA: hdmi - dont fail on extra nodes
      ALSA: intelhdmi - add id for the CougarPoint chipset
      ALSA: intelhdmi - user friendly codec name
      ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS
      ALSA: asihpi: incorrect range check
      ALSA: asihpi: testing the wrong variable
      ALSA: es1688: add pedantic range checks
      ARM: McBSP: Add support for omap4 in McBSP driver
      ARM: McBSP: Fix request for irq in OMAP4
      OMAP: McBSP: Add 32-bit mode support
      ...
  4. Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux

    torvalds committed May 20, 2010
    * 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux: (21 commits)
      i2c-highlander: remover superflous variable
      i2c-ibm-iic: drop NO_IRQ
      i2c-cpm: drop NO_IRQ
      i2c-mpc: drop NO_IRQ
      MAINTAINERS: add i2c tree for embedded platforms
      i2c-pxa: only define 'blue_murder'-function if DEBUG is #defined
      i2c-pxa: remove unused macro
      i2c-nomadik: fix operator precedence warning
      i2c-nomadik: release region when removed
      OMAP3: I2C: Clean up Errata 1p153 handling
      OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
      omap: i2c: add a timeout to the busy waiting
      omap: i2c: make errata 1.153 workaround a separate function
      i2c-omap: add mpu wake up latency constraint in i2c
      omap: i2c: Add i2c support on omap4 platform
      i2c-bfin-twi: return completion in interrupt for smbus quick transfers
      i2c-bfin-twi: remove redundant retry
      i2c-bfin-twi: fix lost interrupts at high speeds
      i2c-bfin-twi: add debug output for error status
      i2c-bfin-twi: integrate timeout timer with completion interface
      ...
  5. Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed May 20, 2010
    …ernel/git/mchehab/linux-2.6
    
    * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
      V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
      V4L/DVB: vivi and mem2mem_testdev need slab.h to build
      V4L/DVB: tm6000: bugfix image position
      V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
      V4L/DVB: tm6000: README - add vbi
      V4L/DVB: Fix unlock logic at medusa_video_init
      V4L/DVB: fix dvb frontend lockup
      V4L/DVB: s2255drv: remove dead code
      V4L/DVB: s2255drv: return if vdev not found
      V4L/DVB: ov511: cleanup: remove unneeded null check
      V4L/DVB: media/mem2mem: dereferencing free memory
      V4L/DVB: media/IR: Add missing include file to rc-map.c
      V4L/DVB: dvb/stv6110x: cleanup error handling
      V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
      V4L/DVB: ngene: start separating out DVB functions into separate file
      V4L/DVB: ngene: split out card specific code into a separate file
      V4L/DVB: ngene: split out i2c code into a separate file
      V4L/DVB: ngene: add initial support for digital side of Avermedia m780
      V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
      V4L-DVB: ngene: make sure that tuner headers are included
      ...
  6. Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    torvalds committed May 20, 2010
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (49 commits)
      libata-sff: separate out BMDMA qc_issue
      libata-sff: prd is BMDMA specific
      libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific
      libata-sff: separate out BMDMA EH
      libata-sff: port_task is SFF specific
      libata-sff: ap->[last_]ctl are SFF specific
      libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo()
      libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init()
      libata-sff: clean up BMDMA initialization
      libata-sff: clean up inheritance in several drivers
      libata-sff: reorder SFF/BMDMA functions
      sata_inic162x: kill PORT_PRD_ADDR initialization
      libata: kill ATA_FLAG_DISABLED
      libata-sff: kill unused prototype and make ata_dev_select() static
      libata-sff: update bmdma host bus error handling
      sata_mv: remove unnecessary initialization
      sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF
      pata_sch: use ata_pci_sff_init_one()
      pata_sil680: Do our own exec_command posting
      libata: Remove excess delay in the tf_load path
      ...
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/jikos/trivial
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
      vlynq: make whole Kconfig-menu dependant on architecture
      add descriptive comment for TIF_MEMDIE task flag declaration.
      EEPROM: max6875: Header file cleanup
      EEPROM: 93cx6: Header file cleanup
      EEPROM: Header file cleanup
      agp: use NULL instead of 0 when pointer is needed
      rtc-v3020: make bitfield unsigned
      PCI: make bitfield unsigned
      jbd2: use NULL instead of 0 when pointer is needed
      cciss: fix shadows sparse warning
      doc: inode uses a mutex instead of a semaphore.
      uml: i386: Avoid redefinition of NR_syscalls
      fix "seperate" typos in comments
      cocbalt_lcdfb: correct sections
      doc: Change urls for sparse
      Powerpc: wii: Fix typo in comment
      i2o: cleanup some exit paths
      Documentation/: it's -> its where appropriate
      UML: Fix compiler warning due to missing task_struct declaration
      UML: add kernel.h include to signal.c
      ...
  8. Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

    torvalds committed May 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
      pcmcia: disable PCMCIA ioctl also for ARM
      drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
      drivers/staging/comedi: dev_node removal (ni_mio_cs)
      drivers/staging/comedi: dev_node removal (ni_labpc_cs)
      drivers/staging/comedi: dev_node removal (ni_daq_dio24)
      drivers/staging/comedi: dev_node removal (ni_daq_700)
      drivers/staging/comedi: dev_node removal (das08_cs)
      drivers/staging/comedi: dev_node removal (cb_das16_cs)
      pata_pcmcia: get rid of extra indirection
      pcmcia: remove suspend-related comment from yenta_socket.c
      pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
      pcmcia: remove pcmcia_add_device_lock
      pcmcia: update gfp/slab.h includes
      pcmcia: remove unused mem_op.h
      pcmcia: do not autoadd root PCI bus resources
      pcmcia: clarify alloc_io_space, move it to resource handlers
      pcmcia: move all pcmcia_resource_ops providers into one module
      pcmcia: move high level CIS access code to separate file
      pcmcia: dev_node removal (core)
      pcmcia: dev_node removal (remaining drivers)
      ...
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/rafael/suspend-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM: PM QOS update fix
      Freezer / cgroup freezer: Update stale locking comments
      PM / platform_bus: Allow runtime PM by default
      i2c: Fix bus-level power management callbacks
      PM QOS update
      PM / Hibernate: Fix block_io.c printk warning
      PM / Hibernate: Group swap ops
      PM / Hibernate: Move the first_sector out of swsusp_write
      PM / Hibernate: Separate block_io
      PM / Hibernate: Snapshot cleanup
      FS / libfs: Implement simple_write_to_buffer
      PM / Hibernate: document open(/dev/snapshot) side effects
      PM / Runtime: Add sysfs debug files
      PM: Improve device power management document
      PM: Update device power management document
      PM: Allow runtime_suspend methods to call pm_schedule_suspend()
      PM: pm_wakeup - switch to using bool
  10. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/tj/wq
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
      workqueue: change cancel_work_sync() to clear work->data
      workqueue: warn about flush_scheduled_work()
  11. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      ia64: add sparse annotation to __ia64_per_cpu_var()
      percpu: implement kernel memory based chunk allocation
      percpu: move vmalloc based chunk management into percpu-vm.c
      percpu: misc preparations for nommu support
      percpu: reorganize chunk creation and destruction
      percpu: factor out pcpu_addr_in_first/reserved_chunk() and update per_cpu_ptr_to_phys()
  12. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/core: Use kmemdup() instead of kmalloc()+memcpy()
      IB/iser: Fix error flow in iser_create_ib_conn_res()
      IB/iser: Enhance disconnection logic for multi-pathing
      IB/iser: Remove buggy back-pointer setting
      IB/iser: Add asynchronous event handler
      MAINTAINERS: Add cxgb4 and iw_cxgb4 entries
      RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays
      IPoIB: Allow disabling/enabling TSO on the fly through ethtool
      IB/mlx4: Add support for masked atomic operations
      IB/core: Add support for masked atomic operations
      RDMA/cma: Randomize local port allocation
      RDMA/nes: Make unnecessarily global functions static
      RDMA/nes: Make nesadapter->phy_lock usage consistent
      RDMA/cxgb4: Add driver for Chelsio T4 RNIC
      IB/mthca: Use the dma state API instead of pci equivalents
      RDMA/amso1100: Use the dma state API instead of pci equivalents
      RDMA/cxgb3: Don't free skbs on NET_XMIT_* indications from LLD
      RDMA/cxgb3: Use the dma state API instead of pci equivalents
      IB: Explicitly rule out llseek to avoid BKL in default_llseek()
  13. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed May 20, 2010
    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (61 commits)
      KEYS: Return more accurate error codes
      LSM: Add __init to fixup function.
      TOMOYO: Add pathname grouping support.
      ima: remove ACPI dependency
      TPM: ACPI/PNP dependency removal
      security/selinux/ss: Use kstrdup
      TOMOYO: Use stack memory for pending entry.
      Revert "ima: remove ACPI dependency"
      Revert "TPM: ACPI/PNP dependency removal"
      KEYS: Do preallocation for __key_link()
      TOMOYO: Use mutex_lock_interruptible.
      KEYS: Better handling of errors from construct_alloc_key()
      KEYS: keyring_serialise_link_sem is only needed for keyring->keyring links
      TOMOYO: Use GFP_NOFS rather than GFP_KERNEL.
      ima: remove ACPI dependency
      TPM: ACPI/PNP dependency removal
      selinux: generalize disabling of execmem for plt-in-heap archs
      LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONE
      CRED: Holding a spinlock does not imply the holding of RCU read lock
      SMACK: Don't #include Ext2 headers
      ...
  14. Merge branch 'topic/asoc' into for-linus

    tiwai committed May 20, 2010
    Conflicts:
    	sound/soc/codecs/ad1938.c
  15. ALSA: hda: Storage class should be before const qualifier

    tklauser committed with tiwai May 20, 2010
    The C99 specification states in section 6.11.5:
    
    The placement of a storage-class specifier other than at the beginning
    of the declaration specifiers in a declaration is an obsolescent
    feature.
    
    Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  16. ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies

    Jarkko Nikula committed with Liam Girdwood May 19, 2010
    These pins are for decoupling capacitors for the internal charge pumps
    in TPA6130A2 and TPA6140A2 and not for connecting external supply.
    
    Thanks to Eduardo Valentin <eduardo.valentin@nokia.com> for pointing out the
    issue with TPA6130A2 and Ilkka Koskinen <ilkka.koskinen@nokia.com> with
    TPA6140A2.
    
    Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Reviewed-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  17. ACPI: fix early DSDT dmi check warnings on ia64

    Lin Ming committed with lenb May 12, 2010
    WARNING: at drivers/firmware/dmi_scan.c:423 dmi_matches+0x70/0x160()
    dmi check: not initialized yet.
    
    This is caused by commit aa2110c
    (ACPI: add boot option acpi=copy_dsdt to fix corrupt DSDT).
    DMI is not initialized yet in acpi_early_init on ia64.
    
    The DSDT DMI check table is x86 specific, so make it empty on other archs.
    And this fixes the warnings on ia64.
    
    Reported-and-tested-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Lin Ming <ming.m.lin@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  18. Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linux

    torvalds committed May 20, 2010
    * 'for-2.6.35' of git://linux-nfs.org/~bfields/linux: (45 commits)
      Revert "nfsd4: distinguish expired from stale stateids"
      nfsd: safer initialization order in find_file()
      nfs4: minor callback code simplification, comment
      NFSD: don't report compiled-out versions as present
      nfsd4: implement reclaim_complete
      nfsd4: nfsd4_destroy_session must set callback client under the state lock
      nfsd4: keep a reference count on client while in use
      nfsd4: mark_client_expired
      nfsd4: introduce nfs4_client.cl_refcount
      nfsd4: refactor expire_client
      nfsd4: extend the client_lock to cover cl_lru
      nfsd4: use list_move in move_to_confirmed
      nfsd4: fold release_session into expire_client
      nfsd4: rename sessionid_lock to client_lock
      nfsd4: fix bare destroy_session null dereference
      nfsd4: use local variable in nfs4svc_encode_compoundres
      nfsd: further comment typos
      sunrpc: centralise most calls to svc_xprt_received
      nfsd4: fix unlikely race in session replay case
      nfsd4: fix filehandle comment
      ...
  19. Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/tro…

    torvalds committed May 20, 2010
    …ndmy/nfs-2.6
    
    * 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (78 commits)
      SUNRPC: Don't spam gssd with upcall requests when the kerberos key expired
      SUNRPC: Reorder the struct rpc_task fields
      SUNRPC: Remove the 'tk_magic' debugging field
      SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqst
      NFS: Don't call iput() in nfs_access_cache_shrinker
      NFS: Clean up nfs_access_zap_cache()
      NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS
      SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameter
      SUNRPC: Ensure memory shrinker doesn't waste time in rpcauth_prune_expired()
      SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS
      NFS: Read requests can use GFP_KERNEL.
      NFS: Clean up nfs_create_request()
      NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls
      NFSv4: Don't use GFP_KERNEL allocations in state recovery
      SUNRPC: Fix xs_setup_bc_tcp()
      SUNRPC: Replace jiffies-based metrics with ktime-based metrics
      ktime: introduce ktime_to_ms()
      SUNRPC: RPC metrics and RTT estimator should use same RTT value
      NFS: Calldata for nfs4_renew_done()
      NFS: Squelch compiler warning in nfs_add_server_stats()
      ...
  20. Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds committed May 20, 2010
    …l/git/frederic/random-tracing
    
    * 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      sunrpc: Include missing smp_lock.h
      procfs: Kill the bkl in ioctl
      procfs: Push down the bkl from ioctl
      procfs: Use generic_file_llseek in /proc/vmcore
      procfs: Use generic_file_llseek in /proc/kmsg
      procfs: Use generic_file_llseek in /proc/kcore
      procfs: Kill BKL in llseek on proc base
  21. Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux…

    torvalds committed May 20, 2010
    …/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      clocksource: Add clocksource_register_hz/khz interface
      posix-cpu-timers: Optimize run_posix_cpu_timers()
      time: Remove xtime_cache
      mqueue: Convert message queue timeout to use hrtimers
      hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIME
      timers: Introduce the concept of timer slack for legacy timers
      ntp: Remove tickadj
      ntp: Make time_adjust static
      time: Add xtime, wall_to_monotonic to feature-removal-schedule
      timer: Try to survive timer callback preempt_count leak
      timer: Split out timer function call
      timer: Print function name for timer callbacks modifying preemption count
      time: Clean up warp_clock()
      cpu-timers: Avoid iterating over all threads in fastpath_timer_check()
      cpu-timers: Change SIGEV_NONE timer implementation
      cpu-timers: Return correct previous timer reload value
      cpu-timers: Cleanup arm_timer()
      cpu-timers: Simplify RLIMIT_CPU handling
  22. Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    torvalds committed May 20, 2010
    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      cs5535-clockevt: Free timer in IRQ setup error path
  23. Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/…

    torvalds committed May 20, 2010
    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, hpet: Add reference to chipset erratum documentation for disable-hpet-msi-quirk
      x86, hpet: Restrict read back to affected ATI chipsets
  24. Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/…

    torvalds committed May 20, 2010
    …scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      avr32: Fix typo in read_persistent_clock()
      sparc: Convert sparc to use read/update_persistent_clock
      cris: Convert cris to use read/update_persistent_clock
      m68k: Convert m68k to use read/update_persistent_clock
      m32r: Convert m32r to use read/update_peristent_clock
      blackfin: Convert blackfin to use read/update_persistent_clock
      ia64: Convert ia64 to use read/update_persistent_clock
      avr32: Convert avr32 to use read/update_persistent_clock
      h8300: Convert h8300 to use read/update_persistent_clock
      frv: Convert frv to use read/update_persistent_clock
      mn10300: Convert mn10300 to use read/update_persistent_clock
      alpha: Convert alpha to use read/update_persistent_clock
      xtensa: Fix unnecessary setting of xtime
      time: Clean up direct xtime usage in xen
  25. Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/lin…

    torvalds committed May 20, 2010
    …ux/kernel/git/tip/linux-2.6-tip
    
    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      genirq: Clear CPU mask in affinity_hint when none is provided
      genirq: Add CPU mask affinity hint
      genirq: Remove IRQF_DISABLED from core code
      genirq: Run irq handlers with interrupts disabled
      genirq: Introduce request_any_context_irq()
      genirq: Expose irq_desc->node in proc/irq
    
    Fixed up trivial conflicts in Documentation/feature-removal-schedule.txt
Commits on May 19, 2010
  1. i2c-highlander: remover superflous variable

    Wolfram Sang committed with Ben Dooks Feb 2, 2010
    When cppcheck found this flaw
    
    [./i2c/busses/i2c-highlander.c:284]: (style) Warning - using char variable in bit operation
    
    it was noted that the 'read'-variable could be simply removed as read_write can
    only be 0 or 1 anyhow. So, we remove the flaw and simplify the code.
    
    Reported-by: d binderman <dcb314@hotmail.com>
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Paul Mundt <lethal@linux-sh.org>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Cc: Ben Dooks <ben-linux@fluff.org>
  2. i2c-ibm-iic: drop NO_IRQ

    Wolfram Sang committed with Ben Dooks Oct 4, 2009
    Drop NO_IRQ as 0 is the preferred way to describe 'no irq'
    (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is
    only used on powerpc, where NO_IRQ is 0 anyhow.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Acked-by: Sean MacLennan <smaclennan@pikatech.com>
    Cc: Ben Dooks <ben-linux@fluff.org>
  3. i2c-cpm: drop NO_IRQ

    Wolfram Sang committed with Ben Dooks Oct 4, 2009
    Drop NO_IRQ as 0 is the preferred way to describe 'no irq'
    (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is
    only used on powerpc, where NO_IRQ is 0 anyhow.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Acked-by: Jochen Friedrich <jochen@scram.de>
    Cc: Ben Dooks <ben-linux@fluff.org>
  4. i2c-mpc: drop NO_IRQ

    Wolfram Sang committed with Ben Dooks Oct 4, 2009
    Drop NO_IRQ as 0 is the preferred way to describe 'no irq'
    (http://lkml.org/lkml/2005/11/21/221). This change is safe, as the driver is
    only used on powerpc, where NO_IRQ is 0 anyhow.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Acked-by: Grant Likely <grant.likely@secretlab.ca>
    Cc: Ben Dooks <ben-linux@fluff.org>