1. 31 May, 2013 5 commits
    • Andy Lutomirski's avatar
      drm: Update drm_addmap and drm_mmap to use PAT WC instead of MTRRs · ff47eaf2
      Andy Lutomirski authored
      Previously, DRM_FRAME_BUFFER mappings, as well as DRM_REGISTERS
      mappings with DRM_WRITE_COMBINING set, resulted in an unconditional
      MTRR being added but the actual mappings being created as UC-.
      
      Now these mappings have the MTRR added only if needed, but they will
      be mapped with pgprot_writecombine.
      
      The non-WC DRM_REGISTERS case now uses pgprot_noncached instead of
      hardcoding the bit twiddling.
      
      The DRM_AGP case is unchanged for now.
      
      [airlied: fix ppc build]
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ff47eaf2
    • Andy Lutomirski's avatar
      drm (ast, cirrus, mgag200, nouveau, savage, vmwgfx): Remove drm_mtrr_{add, del} · 247d36d7
      Andy Lutomirski authored
      This replaces drm_mtrr_{add,del} with arch_phys_wc_{add,del}.  The
      interface is simplified (because the base and size parameters to
      drm_mtrr_del never did anything), and it no longer adds MTRRs on
      systems that don't need them.
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      247d36d7
    • Andy Lutomirski's avatar
      Add arch_phys_wc_{add, del} to manipulate WC MTRRs if needed · d0d98eed
      Andy Lutomirski authored
      Several drivers currently use mtrr_add through various #ifdef guards
      and/or drm wrappers.  The vast majority of them want to add WC MTRRs
      on x86 systems and don't actually need the MTRR if PAT (i.e.
      ioremap_wc, etc) are working.
      
      arch_phys_wc_add and arch_phys_wc_del are new functions, available
      on all architectures and configurations, that add WC MTRRs on x86 if
      needed (and handle errors) and do nothing at all otherwise.  They're
      also easier to use than mtrr_add and mtrr_del, so the call sites can
      be simplified.
      
      As an added benefit, this will avoid wasting MTRRs and possibly
      warning pointlessly on PAT-supporting systems.
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      d0d98eed
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2013-05-20-merged' of... · e81f3d81
      Dave Airlie authored
      Merge tag 'drm-intel-next-2013-05-20-merged' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
      
      Daniel writes:
      Highlights (copy-pasted from my testing cycle mails):
      - fbc support for Haswell (Rodrigo)
      - streamlined workaround comments, including an igt tool to grep for
        them (Damien)
      - sdvo and TV out cleanups, including a fixup for sdvo multifunction devices
      - refactor our eDP mess a bit (Imre)
      - don't register the hdmi connector on haswell when desktop eDP is present
      - vlv support is no longer preliminary!
      - more vlv fixes from Jesse for stolen and dpll handling
      - more flexible power well checking infrastructure from Paulo
      - a few gtt patches from Ben
      - a bit of OCD cleanups for transcoder #defines and an assorted pile
        of smaller things.
      - fixes for the gmch modeset sequence
      - a bit of OCD around plane/pipe usage (Ville)
      - vlv turbo support (Jesse)
      - tons of vlv modeset fixes (Jesse et al.)
      - vlv pte write fixes (Kenneth Graunke)
      - hpd filtering to avoid costly probes on unaffected outputs (Egbert Eich)
      - intel dev_info cleanups and refactorings (Damien)
      - vlv rc6 support (Jesse)
      - random pile of fixes around non-24bpp modes handling
      - asle/opregion cleanups and locking fixes (Jani)
      - dp dpll refactoring
      - improvements for reduced_clock computation on g4x/ilk+
      - pfit state refactored to use pipe_config (Jesse)
      - lots more computed modeset state moved to pipe_config, including readout
        and cross-check support
      - fdi auto-dithering for ivb B/C links, using the neat pipe_config
        improvements
      - drm_rect helpers plus sprite clipping fixes (Ville)
      - hw context refcounting (Mika + Ben)
      
      * tag 'drm-intel-next-2013-05-20-merged' of git://people.freedesktop.org/~danvet/drm-intel: (155 commits)
        drm/i915: add support for dvo Chrontel 7010B
        drm/i915: Use pipe config state to control gmch pfit enable/disable
        drm/i915: Use pipe_config state to disable ilk+ pfit
        drm/i915: panel fitter hw state readout&check support
        drm/i915: implement WADPOClockGatingDisable for LPT
        drm/i915: Add missing platform tags to FBC workaround comments
        drm/i915: rip out an unused lvds_reg variable
        drm/i915: Compute WR PLL dividers dynamically
        drm/i915: HSW FBC WaFbcDisableDpfcClockGating
        drm/i915: HSW FBC WaFbcAsynchFlipDisableFbcQueue
        drm/i915: Enable FBC at Haswell.
        drm/i915: IVB FBC WaFbcDisableDpfcClockGating
        drm/i915: IVB FBC WaFbcAsynchFlipDisableFbcQueue
        drm/i915: Add support for FBC on Ivybridge.
        drm/i915: Organize VBT stuff inside drm_i915_private
        drm/i915: make SDVO TV-out work for multifunction devices
        drm/i915: rip out now unused is_foo tracking from crtc code
        drm/i915: rip out TV-out lore ...
        drm/i915: drop TVclock special casing on ilk+
        drm/i915: move sdvo TV clock computation to intel_sdvo.c
        ...
      e81f3d81
    • Dave Airlie's avatar
      drm/qxl: fix build warnings on 32-bit · 970fa986
      Dave Airlie authored
      Just the usual printk related warnings.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      970fa986
  2. 29 May, 2013 7 commits
  3. 28 May, 2013 1 commit
  4. 24 May, 2013 3 commits
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 5ed77662
      Dave Airlie authored
      Daniel writes:
      A few fixes, nothing shocking:
      - More Haswell pci ids. Includes a pile of marketing spare ids (which
        despite the spare moniker show up all over the place).
      - Fix a regression in handling modeset failures, resulting in black
        screens on 3 pipe setups when we've run out of pch plls (Chris).
      - Fix up the setcrtc semantics to unconditionally enable the outputs.
        Juding from git digging that has (kinda) always been the case and neatly
        fixes a few long-standing (i.e. forever) bug reports (Imre).
      - jiffies_timeout + 1 patches from Imre. They partially fix spurious
        wait_event failures in the interrupt-driven dp aux/i2c code. The other
        part is a core patch for the wait_event macros going in through -mm. A
        few patches more than strictly required since Imre is pushing for a
        general solution in 3.11.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: avoid premature DP AUX timeouts
        drm/i915: avoid premature timeouts in __wait_seqno()
        drm/i915: use msecs_to_jiffies_timeout instead of open coding the same
        drm/i915: add msecs_to_jiffies_timeout to guarantee minimum duration
        drm/i915: force full modeset if the connector is in DPMS OFF mode
        drm/i915: Propagate errors back from fb set-base
        drm/i915: Adding more reserved PCI IDs for Haswell.
      5ed77662
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-fixes' of... · 80ce5f6f
      Dave Airlie authored
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Inki writes:
        This pull request includes drm_send_vblank_event() helper
         relevant patch I missed and code cleanups. And also it fixes
         a pended page flip issue.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: replace request_threaded_irq with devm function
        drm/exynos: remove unnecessary devm_kfree
        drm/exynos: fix build warnings from ipp fimc
        drm/exynos: cleanup device pointer usages
        drm/exynos: wait for the completion of pending page flip
        drm/exynos: use drm_send_vblank_event() helper
        drm/exynos: page flip fixes
        drm/exynos: exynos_hdmi: Pass correct pointer to free_irq()
        drm/exynos: exynos_drm_ipp: Fix incorrect usage of IS_ERR_OR_NULL
        drm/exynos: exynos_drm_fbdev: Fix incorrect usage of IS_ERR_OR_NULL
      
      Conflicts:
      	drivers/gpu/drm/exynos/exynos_hdmi.c
      80ce5f6f
    • Dave Airlie's avatar
      Merge remote-tracking branch 'pfdo/drm-fixes' into drm-next · c313d567
      Dave Airlie authored
      Pull the vblank event changes into a Linus master tree to make merging
      easier.
      c313d567
  5. 23 May, 2013 18 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · b91fd4d5
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "Here are some more fixes for v3.10.  The Moorestown update broke Intel
        Medfield devices, so I reverted it.  The acpiphp change fixes a
        regression: we broke hotplug notifications to host bridges when we
        split acpiphp into the host-bridge related part and the
        endpoint-related part.
      
        Moorestown
            Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        Hotplug
            PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check"
      
      * tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
      b91fd4d5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4c0eec03
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "A few fixups to Wacom and eGalax touchscreen driver"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - add an eraser to DTH2242/DTK2241
        Input: wacom - add a few new styli for Cintiq series
        Input: wacom - add three new display tablets
        Input: egalax_ts - ABS_MT_POSITION_Y not reported well
      4c0eec03
    • Linus Torvalds's avatar
      Merge tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · d9795562
      Linus Torvalds authored
      Pull tty/serial fixes from Greg Kroah-Hartman:
       "Here are some tty / serial driver fixes for 3.10-rc2.
      
        Nothing huge, although the rocket driver fix looks large, it's just
        moving the code around to fix the reported build issues in it.  Other
        than that, this has the fix for the of-reported lockdep warning from
        the vt layer, as well as some other needed bugfixes.
      
        All of these have been in linux-next for a while"
      
      * tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: mxser: Fix build warning introduced by dfc7b837 (Re: linux-next: build warning after merge of the tty.current tree)
        tty: mxser: fix usage of opmode_ioaddr
        serial: 8250_dw: add ACPI ID for Intel BayTrail
        TTY: Fix tty miss restart after we turn off flow-control
        tty/vt: Fix vc_deallocate() lock order
        TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit
        TTY: rocket, fix more no-PCI warnings
        serial: mcf: missing uart_unregister_driver() on error in mcf_init()
        tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init()
        serial: samsung: add missing platform_driver_unregister() when module exit
        serial: pl011: protect attribute read from NULL platform data struct
        tty: nwpserial: Pass correct pointer to free_irq()
        serial: 8250_dw: Add valid clk pointer check
      d9795562
    • Linus Torvalds's avatar
      Merge tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 388c2896
      Linus Torvalds authored
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are some staging tree driver fixes for 3.10-rc2
      
        The drivers/iio/ changes are here as they are still tied into
        drivers/staging/iio/.
      
        Nothing major, just a number of small bugfixes, and a larger
        documentation update for the ramster code."
      
      * tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)
        staging: dwc2: remove compile warning for USB_DWC2_TRACK_MISSED_SOFS
        iio: exynos_adc: fix wrong structure extration in suspend and resume
        iio:common:st: added disable function after read info raw data
        iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
        staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()
        staging/iio/mxs-lradc: fix preenable for multiple buffers
        staging: imx-drm: imx-tve: Check the return value of 'regulator_enable()'
        staging: video: imx: Select VIDEOMODE_HELPERS for parallel display
        staging: ramster: add how-to document
        staging: dwc2: Fix dma-enabled platform devices using a default dma_mask
        staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower.
        staging: Swap zram and zsmalloc in Kconfig
        staging: android: logger: use kuid_t instead of uid_t
        staging: zcache: Fix incorrect module_param_array types
        staging/solo6x10: depend on CONFIG_FONTS
        staging/drm: imx: add missing dependencies
        staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning
        staging: sep: fix driver build and kconfig
        staging: nvec: cleanup childs on remove
        staging: nvec: implement unregistering of notifiers
        ...
      388c2896
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.10-rc2' of... · c7153d06
      Linus Torvalds authored
      Merge tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are 3 tiny driver core fixes for 3.10-rc2.
      
        A needed symbol export, a change to make it easier to track down
        offending sysfs files with incorrect attributes, and a klist bugfix.
      
        All have been in linux-next for a while"
      
      * tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        klist: del waiter from klist_remove_waiters before wakeup waitting process
        driver core: print sysfs attribute name when warning about bogus permissions
        driver core: export subsys_virtual_register
      c7153d06
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 5cc0c038
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg Kroah-Hartman:
       "Here are some small char/misc driver fixes for 3.10-rc2.
      
        Nothing major here, just a number of fixes for things that people have
        reported, and a MAINTAINERS update for the recent changes for the
        hyperv files that went into 3.10-rc1."
      
      * tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port
        uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
        MAINTAINERS: update Hyper-V file list
        mei: bus: Reset event_cb when disabling a device
        Drivers: hv: Fix a bug in get_vp_index()
        mei: fix out of array access to me clients array
        Char: lp, protect LPGETSTATUS with port_mutex
        dummy-irq: require the user to specify an IRQ number
      5cc0c038
    • Linus Torvalds's avatar
      Merge tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b6419406
      Linus Torvalds authored
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a number of tiny USB bugfixes / new device ids for 3.10-rc2
      
        The majority of these are USB gadget fixes, but they are all small.
        Other than that, some USB host controller fixes, and USB serial driver
        fixes for problems reported with them.
      
        Also hopefully a fixed up USB_OTG Kconfig dependancy, that one seems
        to be almost impossible to get right for all of the different
        platforms these days."
      
      * tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (56 commits)
        USB: cxacru: potential underflow in cxacru_cm_get_array()
        USB: ftdi_sio: Add support for Newport CONEX motor drivers
        USB: option: add device IDs for Dell 5804 (Novatel E371) WWAN card
        usb: ohci: fix goto wrong tag in err case
        usb: isp1760-if: fix memleak when platform_get_resource fail
        usb: ehci-s5p: fix memleak when fallback to pdata
        USB: serial: clean up chars_in_buffer
        USB: ti_usb_3410_5052: fix chars_in_buffer overhead
        USB: io_ti: fix chars_in_buffer overhead
        USB: ftdi_sio: fix chars_in_buffer overhead
        USB: ftdi_sio: clean up get_modem_status
        USB: serial: add generic wait_until_sent implementation
        USB: serial: add wait_until_sent operation
        USB: set device dma_mask without reference to global data
        USB: Blacklisted Cinterion's PLxx WWAN Interface
        usb: option: Add Telewell TW-LTE 4G
        USB: EHCI: remove bogus #error
        USB: reset resume quirk needed by a hub
        USB: usb-stor: realtek_cr: Fix compile error
        usb, chipidea: fix link error when USB_EHCI_HCD is a module
        ...
      b6419406
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 72dd4e79
      Linus Torvalds authored
      Pull kvm bugfixes from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()
        KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API.
        KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry
      72dd4e79
    • Randy Dunlap's avatar
      lib: make iovec obj instead of lib · b4d3ba33
      Randy Dunlap authored
      Fix build error io vmw_vmci.ko when CONFIG_VMWARE_VMCI=m by chaning
      iovec.o from lib-y to obj-y.
      
        ERROR: "memcpy_toiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
        ERROR: "memcpy_fromiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b4d3ba33
    • Ping Cheng's avatar
      Input: wacom - add an eraser to DTH2242/DTK2241 · c73a1afb
      Ping Cheng authored
      plus send begin and end of express keys events for
      Cintiq 13HD and DTH2242/DTK2241
      Signed-off-by: default avatarPing Cheng <pingc@wacom.com>
      Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      c73a1afb
    • Seung-Woo Kim's avatar
      drm/exynos: replace request_threaded_irq with devm function · dcb9a7c7
      Seung-Woo Kim authored
      devm_request_threaded_irq is used instead of request_threaded_irq
      and free_irq is removed.
      Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      dcb9a7c7
    • Seung-Woo Kim's avatar
      drm/exynos: remove unnecessary devm_kfree · 7a1b00e0
      Seung-Woo Kim authored
      devm_kfree does not need for fail case of probe function and for
      remove function.
      Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      7a1b00e0
    • Seung-Woo Kim's avatar
      drm/exynos: fix build warnings from ipp fimc · a3ad6976
      Seung-Woo Kim authored
      Becuase of order of headers, there are build warnings and they are
      fixed with this patch.
      Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      a3ad6976
    • Seung-Woo Kim's avatar
      drm/exynos: cleanup device pointer usages · d873ab99
      Seung-Woo Kim authored
      Struct device pointer got from platform device pointer is already
      alsigned as variable, but some functions do not use device pointer.
      So this patch replaces thoes usages.
      Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      d873ab99
    • Inki Dae's avatar
      drm/exynos: wait for the completion of pending page flip · 20cd2640
      Inki Dae authored
      This patch fixes the issue that drm_vblank_get() is failed.
      
      The issus occurs when next page flip request is tried
      if previous page flip event wasn't completed yet and then
      dpms became off.
      
      So this patch make sure that page flip event is completed
      before dpms goes to off.
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      20cd2640
    • Rob Clark's avatar
      drm/exynos: use drm_send_vblank_event() helper · c5cca97f
      Rob Clark authored
      Rebased.
      Signed-off-by: default avatarRob Clark <rob@ti.com>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      c5cca97f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 · 101b82f5
      Linus Torvalds authored
      Pull AVR32 update from Hans-Christian Egtvedt:
       "wow, it has gone 10 releases since my last request :("
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
        avr32: fix building warnings caused by redefinitions of HZ
        avr32: fix relocation check for signed 18-bit offset
        avr32: move NODES_SHIFT into Kconfig and delete numnodes.h
      101b82f5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3cb7a59f
      Linus Torvalds authored
      Pull MIPS update from Ralf Baechle:
       - Fix a build error if <linux/printk.h> is included without
         <linux/linkage.h> having been included before.
       - Cleanup and fix the damage done by the generic idle loop patch.
       - A kprobes fix that brings the MIPS code in line with what other
         architectures are for quite a while already.
       - Wire up the native getdents64(2) syscall for 64 bit - for some reason
         it was only for the compat ABIs.  This has been reported to cause an
         application issue.  This turned out bigger than I meant but the wait
         instruction support code was driving me nuts.
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: N64: Wire getdents64(2)
        kprobes/mips: Fix to check double free of insn slot
        MIPS: Idle: Break r4k_wait into two functions and fix it.
        MIPS: Idle: Do address fiddlery in helper functions.
        MIPS: Idle: Consolidate all declarations in <asm/idle.h>.
        MIPS: Idle: Don't call local_irq_disable() in cpu_wait() implementations.
        MIPS: Idle: Re-enable irqs at the end of r3081, au1k and loongson2 cpu_wait.
        MIPS: Idle: Make call of function pointer readable.
        MIPS: Idle: Consistently reformat inline assembler.
        MIPS: Idle: cleaup SMTC idle hook as per Linux coding style.
        MIPS: Consolidate idle loop / WAIT instruction support in a single file.
        MIPS: clock.h: Remove declaration of cpu_wait.
        Add include dependencies to <linux/printk.h>.
        MIPS: Rewrite pfn_valid to work in modules, too.
      3cb7a59f
  6. 22 May, 2013 6 commits