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

    …git/jikos/trivial
    
    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
      Documentation: update broken web addresses.
      fix comment typo "choosed" -> "chosen"
      hostap:hostap_hw.c Fix typo in comment
      Fix spelling contorller -> controller in comments
      Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
      fs/Kconfig: Fix typo Userpace -> Userspace
      Removing dead MACH_U300_BS26
      drivers/infiniband: Remove unnecessary casts of private_data
      fs/ocfs2: Remove unnecessary casts of private_data
      libfc: use ARRAY_SIZE
      scsi: bfa: use ARRAY_SIZE
      drm: i915: use ARRAY_SIZE
      drm: drm_edid: use ARRAY_SIZE
      synclink: use ARRAY_SIZE
      block: cciss: use ARRAY_SIZE
      comment typo fixes: charater => character
      fix comment typos concerning "challenge"
      arm: plat-spear: fix typo in kerneldoc
      reiserfs: typo comment fix
      update email address
      ...
    torvalds committed Aug 4, 2010
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (30 commits)
      Revert "HID: add support for the Wacom Intuos 4 wireless"
      HID: fix up Kconfig entry for ACRUX driver
      HID: add ACRUX game controller force feedback support
      HID: Force input registration for "VEC footpedal"
      HID: add HID_QUIRK_HIDINPUT_FORCE
      HID: hid-input.c: indentation fixes
      HID: hiddev: use usb_find_interface, get rid of BKL
      HID: ignore digitizer usage Undefined (0x00)
      HID: Add support for Conceptronic CLLRCMCE
      HID: hid-ids.h: Whitespace fixup, align using TABs
      HID: picolcd: implement refcounting of framebuffer
      HID: picolcd: do not reallocate memory on depth change
      HID: picolcd: Add minimal palette required by fbcon on 8bpp
      HID: magicmouse: Correct parsing of large X and Y motions.
      HID: magicmouse: report last touch up
      HID: picolcd: fix deferred_io init/cleanup to fb ordering
      HID: hid-ids.h: keep vendor ids in alphabetical order
      HID: add proper support for Elecom BM084 bluetooth mouse
      HID: magicmouse: enable horizontal scrolling
      HID: magicmouse: add param for scroll speed
      ...
    torvalds committed Aug 4, 2010
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (39 commits)
      random: Reorder struct entropy_store to remove padding on 64bits
      padata: update API documentation
      padata: Remove padata_get_cpumask
      crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier
      crypto: pcrypt - Rename pcrypt_instance
      padata: Pass the padata cpumasks to the cpumask_change_notifier chain
      padata: Rearrange set_cpumask functions
      padata: Rename padata_alloc functions
      crypto: pcrypt - Dont calulate a callback cpu on empty callback cpumask
      padata: Check for valid cpumasks
      padata: Allocate cpumask dependend recources in any case
      padata: Fix cpu index counting
      crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      pcrypt: Added sysfs interface to pcrypt
      padata: Added sysfs primitives to padata subsystem
      padata: Make two separate cpumasks
      padata: update documentation
      padata: simplify serialization mechanism
      padata: make padata_do_parallel to return zero on success
      padata: Handle empty padata cpumasks
      ...
    torvalds committed Aug 4, 2010
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tj/percpu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
      percpu: allow limited allocation before slab is online
      percpu: make @dyn_size always mean min dyn_size in first chunk init functions
    torvalds committed Aug 4, 2010
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (276 commits)
      [SCSI] zfcp: Trigger logging in the FCP channel on qdio error conditions
      [SCSI] zfcp: Introduce experimental support for DIF/DIX
      [SCSI] zfcp: Enable data division support for FCP devices
      [SCSI] zfcp: Prevent access on uninitialized memory.
      [SCSI] zfcp: Post events through FC transport class
      [SCSI] zfcp: Cleanup QDIO attachment and improve processing.
      [SCSI] zfcp: Cleanup function parameters for sbal value.
      [SCSI] zfcp: Use correct width for timer_interval field
      [SCSI] zfcp: Remove SCSI device when removing unit
      [SCSI] zfcp: Use memdup_user and kstrdup
      [SCSI] zfcp: Fix retry after failed "open port" erp action
      [SCSI] zfcp: Fail erp after timeout
      [SCSI] zfcp: Use forced_reopen in terminate_rport_io callback
      [SCSI] zfcp: Register SCSI devices after successful fc_remote_port_add
      [SCSI] zfcp: Do not try "forced close" when port is already closed
      [SCSI] zfcp: Do not unblock rport from REOPEN_PORT_FORCED
      [SCSI] sd: add support for runtime PM
      [SCSI] implement runtime Power Management
      [SCSI] convert to the new PM framework
      [SCSI] Unify SAM_ and SAM_STAT_ macros
      ...
    torvalds committed Aug 4, 2010
  6. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)
      phy/marvell: add 88ec048 support
      igb: Program MDICNFG register prior to PHY init
      e1000e: correct MAC-PHY interconnect register offset for 82579
      hso: Add new product ID
      can: Add driver for esd CAN-USB/2 device
      l2tp: fix export of header file for userspace
      can-raw: Fix skb_orphan_try handling
      Revert "net: remove zap_completion_queue"
      net: cleanup inclusion
      phy/marvell: add 88e1121 interface mode support
      u32: negative offset fix
      net: Fix a typo from "dev" to "ndev"
      igb: Use irq_synchronize per vector when using MSI-X
      ixgbevf: fix null pointer dereference due to filter being set for VLAN 0
      e1000e: Fix irq_synchronize in MSI-X case
      e1000e: register pm_qos request on hardware activation
      ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice
      net: Add getsockopt support for TCP thin-streams
      cxgb4: update driver version
      cxgb4: add new PCI IDs
      ...
    
    Manually fix up conflicts in:
     - drivers/net/e1000e/netdev.c: due to pm_qos registration
       infrastructure changes
     - drivers/net/phy/marvell.c: conflict between adding 88ec048 support
       and cleaning up the IDs
     - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req
       conflict (registration change vs marking it static)
    torvalds committed Aug 4, 2010
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/konrad/ibft-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
      ibft: Use IBFT_SIGN instead of open-coding the search string.
      ibft: convert iscsi_ibft module to iscsi boot lib
      ibft: separate ibft parsing from sysfs interface
      ibft: For UEFI machines actually do scan ACPI for iBFT.
      ibft: Update iBFT handling for v1.03 of the spec.
    torvalds committed Aug 4, 2010
  8. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Minor formatting fix
      amd64_edac: Fix operator precendence error
      edac, mc: Improve scrub rate handling
      amd64_edac: Correct scrub rate setting
      amd64_edac: Fix DCT base address selector
      amd64_edac: Remove polling mechanism
      x86, mce: Notify about corrected events too
      amd64_edac: Remove unneeded defines
      edac: Remove EDAC_DEBUG_VERBOSE
      amd64_edac: Sanitize syndrome extraction
    torvalds committed Aug 4, 2010
  9. CRED: Fix RCU warning due to previous patch fixing __task_cred()'s ch…

    …ecks
    
    Commit 8f92054 ("CRED: Fix __task_cred()'s lockdep check and banner
    comment") fixed the lockdep checks on __task_cred().  This has shown up
    a place in the signalling code where a lock should be held - namely that
    check_kill_permission() requires its callers to hold the RCU lock.
    
    Fix group_send_sig_info() to get the RCU read lock around its call to
    check_kill_permission().
    
    Without this patch, the following warning can occur:
    
      ===================================================
      [ INFO: suspicious rcu_dereference_check() usage. ]
      ---------------------------------------------------
      kernel/signal.c:660 invoked rcu_dereference_check() without protection!
      ...
    
    Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds Aug 4, 2010
  10. block_dev: always serialize exclusive open attempts

    bd_prepare_to_claim() incorrectly allowed multiple attempts for
    exclusive open to progress in parallel if the attempting holders are
    identical.  This triggered BUG_ON() as reported in the following bug.
    
      https://bugzilla.kernel.org/show_bug.cgi?id=16393
    
    __bd_abort_claiming() is used to finish claiming blocks and doesn't
    work if multiple openers are inside a claiming block.  Allowing
    multiple parallel open attempts to continue doesn't gain anything as
    those are serialized down in the call chain anyway.  Fix it by always
    allowing only single open attempt in a claiming block.
    
    This problem can easily be reproduced by adding a delay after
    bd_prepare_to_claim() and attempting to mount two partitions of a
    disk.
    
    stable: only applicable to v2.6.35
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    htejun committed with torvalds Aug 4, 2010
  11. parisc: pass through '\t' to early (iodc) console

    The firmware handles '\t' internally, so stop trying to emulate it
    (which, incidentally, had a bug in it.)
    
    Fixes a really weird hang at bootup in rcu_bootup_announce, which,
    as far as I can tell, is the first printk in the core kernel to use
    a tab as the first character.
    
    Cc: stable@kernel.org
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    jkkm committed with torvalds Aug 4, 2010
  12. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/rafael/suspend-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / Runtime: Add runtime PM statistics (v3)
      PM / Runtime: Make runtime_status attribute not debug-only (v. 2)
      PM: Do not use dynamically allocated objects in pm_wakeup_event()
      PM / Suspend: Fix ordering of calls in suspend error paths
      PM / Hibernate: Fix snapshot error code path
      PM / Hibernate: Fix hibernation_platform_enter()
      pm_qos: Get rid of the allocation in pm_qos_add_request()
      pm_qos: Reimplement using plists
      plist: Add plist_last
      PM: Make it possible to avoid races between wakeup and system sleep
      PNPACPI: Add support for remote wakeup
      PM: describe kernel policy regarding wakeup defaults (v. 2)
      PM / Hibernate: Fix typos in comments in kernel/power/swap.c
    torvalds committed Aug 4, 2010
  13. Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/…

    …davej/cpufreq
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
      [CPUFREQ] Remove pointless printk from p4-clockmod.
      [CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c
      [CPUFREQ] Fix section mismatch for longhaul_cpu_init.
      [CPUFREQ] Fix section mismatch for longrun_cpu_init.
      [CPUFREQ] powernow-k8: Fix misleading variable naming
      [CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
      [CPUFREQ] arch/x86/kernel/cpu/cpufreq: use for_each_pci_dev()
      [CPUFREQ] fix brace coding style issue.
      [CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent
      [CPUFREQ] acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification
      [CPUFREQ] ondemand: don't synchronize sample rate unless multiple cpus present
      [CPUFREQ] unexport (un)lock_policy_rwsem* functions
      [CPUFREQ] ondemand: Refactor frequency increase code
      [CPUFREQ] powernow-k8: On load failure, remind the user to enable support in BIOS setup
      [CPUFREQ] powernow-k8: Limit Pstate transition latency check
      [CPUFREQ] Fix PCC driver error path
      [CPUFREQ] fix double freeing in error path of pcc-cpufreq
      [CPUFREQ] pcc driver should check for pcch method before calling _OSC
      [CPUFREQ] fix memory leak in cpufreq_add_dev
      [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"
    
    Manually fix up non-data merge conflict introduced by new calling
    conventions for trace_power_start() in commit 6f4f272 ("x86
    cpufreq: Make trace_power_frequency cpufreq driver independent"), which
    didn't update the intel_idle native hardware cpuidle driver.
    torvalds committed Aug 4, 2010
  14. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mjg59/platform-drivers-x86
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
      ips driver: make it less chatty
      intel_scu_ipc: fix size field for intel_scu_ipc_command
      intel_scu_ipc: return -EIO for error condition in busy_loop
      intel_scu_ipc: fix data packing of PMIC command on Moorestown
      Clean up command packing on MRST.
      zero the stack buffer before giving random garbage to the SCU
      Fix stack buffer size for IPC writev messages
      intel_scu_ipc: Use the new cpu identification function
      intel_scu_ipc: tidy up unused bits
      Remove indirect read write api support.
      intel_scu_ipc: Support Medfield processors
      intel_scu_ipc: detect CPU type automatically
      x86 plat: limit x86 platform driver menu to X86
      acpi ec_sys: Be more cautious about ec write access
      acpi ec: Fix possible double io port registration
      hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
      hp-wmi: Fix mixing up of and/or directive
      dell-laptop: make dell_laptop_i8042_filter() static
      asus-laptop: fix asus_input_init error path
      msi-wmi: make needlessly global symbols static
      ...
    torvalds committed Aug 4, 2010
  15. Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/vir…

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (198 commits)
      KVM: VMX: Fix host GDT.LIMIT corruption
      KVM: MMU: using __xchg_spte more smarter
      KVM: MMU: cleanup spte set and accssed/dirty tracking
      KVM: MMU: don't atomicly set spte if it's not present
      KVM: MMU: fix page dirty tracking lost while sync page
      KVM: MMU: fix broken page accessed tracking with ept enabled
      KVM: MMU: add missing reserved bits check in speculative path
      KVM: MMU: fix mmu notifier invalidate handler for huge spte
      KVM: x86 emulator: fix xchg instruction emulation
      KVM: x86: Call mask notifiers from pic
      KVM: x86: never re-execute instruction with enabled tdp
      KVM: Document KVM_GET_SUPPORTED_CPUID2 ioctl
      KVM: x86: emulator: inc/dec can have lock prefix
      KVM: MMU: Eliminate redundant temporaries in FNAME(fetch)
      KVM: MMU: Validate all gptes during fetch, not just those used for new pages
      KVM: MMU: Simplify spte fetch() function
      KVM: MMU: Add gpte_valid() helper
      KVM: MMU: Add validate_direct_spte() helper
      KVM: MMU: Add drop_large_spte() helper
      KVM: MMU: Use __set_spte to link shadow pages
      ...
    torvalds committed Aug 4, 2010
  16. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
      Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add()
      Input: cy8ctmg110 - capacitive touchscreen support
      Input: keyboard - also match braille-only keyboards
      Input: adp5588-keys - export unused GPIO pins
      Input: xpad - add product ID for Hori Fighting Stick EX2
      Input: adxl34x - fix leak and use after free
      Input: samsung-keypad - Add samsung keypad driver
      Input: i8042 - reset keyboard controller wehen resuming from S2R
      Input: synaptics - set min/max for finger width
      Input: synaptics - only report width on hardware that supports it
      Input: evdev - signal that device is writable in evdev_poll()
      Input: mousedev - signal that device is writable in mousedev_poll()
      Input: change input handlers to use bool when possible
      Input: document the MT event slot protocol
      Input: introduce MT event slots
      Input: usbtouchscreen - implement reset_resume
      Input: usbtouchscreen - implement runtime power management
      Input: usbtouchscreen - implement basic suspend/resume
      Input: Add ATMEL QT602240 touchscreen driver
      Input: fix signedness warning in input_set_keycode()
      ...
    torvalds committed Aug 4, 2010
  17. Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/k…

    …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: (243 commits)
      V4L/DVB: sms: Convert IR support to use the Remote Controller core
      V4L/DVB: sms: properly initialize IR phys and IR name
      V4L/DVB: standardize names at rc-dib0700 tables
      V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
      V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
      V4L/DVB: dib0700: properly implement IR change_protocol
      V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
      V4L/DVB: dib0700: avoid bad repeat
      V4L/DVB: Port dib0700 to rc-core
      V4L/DVB: Add a keymap file with dib0700 table
      V4L/DVB: dvb-usb: add support for rc-core mode
      V4L/DVB: dvb-usb: prepare drivers for using rc-core
      V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
      V4L/DVB: rj54n1cb0c: fix a comment in the driver
      V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
      V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
      V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
      V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
      V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
      V4L/DVB: mediabus: fix ambiguous pixel code names
      ...
    torvalds committed Aug 4, 2010
  18. Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/konrad/swiotlb-2.6
    
    * 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
      swiotlb: Make swiotlb bookkeeping functions visible in the header file.
      swiotlb: search and replace "int dir" with "enum dma_data_direction dir"
      swiotlb: Make internal bookkeeping functions have 'swiotlb_tbl' prefix.
      swiotlb: add the swiotlb initialization function with iotlb memory
      swiotlb: add swiotlb_tbl_map_single library function
    torvalds committed Aug 4, 2010
  19. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jmorris/security-testing-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (90 commits)
      AppArmor: fix build warnings for non-const use of get_task_cred
      selinux: convert the policy type_attr_map to flex_array
      AppArmor: Enable configuring and building of the AppArmor security module
      TOMOYO: Use pathname specified by policy rather than execve()
      AppArmor: update path_truncate method to latest version
      AppArmor: core policy routines
      AppArmor: policy routines for loading and unpacking policy
      AppArmor: mediation of non file objects
      AppArmor: LSM interface, and security module initialization
      AppArmor: Enable configuring and building of the AppArmor security module
      AppArmor: update Maintainer and Documentation
      AppArmor: functions for domain transitions
      AppArmor: file enforcement routines
      AppArmor: userspace interfaces
      AppArmor: dfa match engine
      AppArmor: contexts used in attaching policy to system objects
      AppArmor: basic auditing infrastructure.
      AppArmor: misc. base functions and defines
      TOMOYO: Update version to 2.3.0
      TOMOYO: Fix quota check.
      ...
    torvalds committed Aug 4, 2010
  20. Merge branch 'bkl' into for-linus

    Jiri Kosina committed Aug 4, 2010
  21. Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

    Conflicts:
    	drivers/hid/hid-ids.h
    Jiri Kosina committed Aug 4, 2010
  22. Merge branch 'acrux' into for-linus

    Conflicts:
    	drivers/hid/hid-ids.h
    Jiri Kosina committed Aug 4, 2010
  23. Merge branch 'upstream-fixes' into for-linus

    Conflicts:
    	drivers/hid/hid-ids.h
    Jiri Kosina committed Aug 4, 2010
  24. Merge branch 'upstream' into for-linus

    Conflicts:
    	drivers/hid/hid-ids.h
    Jiri Kosina committed Aug 4, 2010
  25. Documentation: update broken web addresses.

    Below you will find an updated version from the original series bunching all patches into one big patch
    updating broken web addresses that are located in Documentation/*
    Some of the addresses date as far far back as 1995 etc... so searching became a bit difficult,
    the best way to deal with these is to use web.archive.org to locate these addresses that are outdated.
    Now there are also some addresses pointing to .spec files some are located, but some(after searching
    on the companies site)where still no where to be found. In this case I just changed the address
    to the company site this way the users can contact the company and they can locate them for the users.
    
    Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Thomas Weber <weber@corscience.de>
    Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
    Cc: Paulo Marques <pmarques@grupopie.com>
    Cc: Randy Dunlap <rdunlap@xenotime.net>
    Cc: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Justin P. Mattock committed with Jiri Kosina Jul 24, 2010
  26. Merge branch 'master' into for-next

    Jiri Kosina committed Aug 4, 2010
  27. fix comment typo "choosed" -> "chosen"

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Uwe Kleine-König committed with Jiri Kosina Jul 30, 2010
  28. hostap:hostap_hw.c Fix typo in comment

    The patch below fixes a typo in a comment.
    
    Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Justin P. Mattock committed with Jiri Kosina Aug 2, 2010
  29. Fix spelling contorller -> controller in comments

    Cc: Jiri Kosina <trivial@kernel.org>
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Stefan Weil <weil@mail.berlios.de>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Stefan Weil committed with Jiri Kosina Aug 3, 2010
  30. amd64_edac: Minor formatting fix

    EDAC MC3: CE page 0xc32281, offset 0x8a0, grain 0, syndrome 0x1, row 2, channel 1, label "": amd64_edac
    EDAC MC3: CE - no information available: amd64_edacError Overflow
    
    Add the missing space before "Error Overflow" on the second line.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Aug 3, 2010
  31. amd64_edac: Fix operator precendence error

    The bitwise AND is of higher precedence, make that explicit.
    
    Cc: <stable@kernel.org> # 34.x
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Aug 3, 2010
  32. phy/marvell: add 88ec048 support

    Marvell 88ec048 is a derivative of its 88e1121r device.  From the programmer's
    perspective, the one major difference is the addition of an additional control
    bit in Page 2 Register 16 - used to control the padding of odd nibble
    preambles.
    
    This patch adds support for this new device, while inheriting as much code as
    possible from the existing 88e1121r implementation.
    
    Signed-off-by: Cyril Chemparathy <cyril@ti.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    cchemparathy committed with davem330 Aug 4, 2010
Commits on Aug 3, 2010
  1. igb: Program MDICNFG register prior to PHY init

    This patch addresses an issue seen on 82580 in which the MDICNFG
    register will be reset during a single function reset and as a
    result we will be unable to communicate with the PHY.  To correct
    the issue, added a call to reset_mdicnfg just prior to the first
    access of the MDICNFG register in sgnii_uses_mdio.
    
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Alexander Duyck committed with davem330 Aug 3, 2010
  2. e1000e: correct MAC-PHY interconnect register offset for 82579

    The MAC-PHY interconnect register set on ICH/PCH parts is accessed through
    a peephole mechanism by writing an offset to a CSR register.  The offset
    for the interconnect's half-duplex control register (which is used in a
    jumbo frame workaround for 82579) is incorrect.
    
    Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
    Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    bwallan committed with davem330 Aug 3, 2010
  3. hso: Add new product ID

    This patch adds a new product ID to the hso driver.
    
    Signed-off-by: Filip Aben <f.aben@option.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Filip Aben committed with davem330 Aug 3, 2010