Merge tag 'phy-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...

Kishon writes:

phy: for 4.6

*) Add driver for rockchip Display Port PHY
*) Add driver for the Rockchip SoC internal eMMC PHY
*) Add usb-uart functionality in rockchip-usb
*) cleanup rcar usb2 PHY driver
*) Fix for randconfig error

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --combined Documentation/kernel-parameters.txt
index 9a53c929f017d16527270bc2244352edf1d34cd8,d91417b6c88e4753e66f59388c74f9c9d6291009..8a6c6c02f91625eebc981b7676c020ec5fa9f390
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1496,11 -1496,6 +1496,11 @@@ bytes respectively. Such letter suffixe
                        could change it dynamically, usually by
                        /sys/module/printk/parameters/ignore_loglevel.
  
 +      ignore_rlimit_data
 +                      Ignore RLIMIT_DATA setting for data mappings,
 +                      print warning at first misuse.  Can be changed via
 +                      /sys/module/kernel/parameters/ignore_rlimit_data.
 +
        ihash_entries=  [KNL]
                        Set number of hash buckets for inode cache.
  
@@@ -3491,6 -3486,12 +3491,12 @@@
  
        ro              [KNL] Mount root device read-only on boot
  
+       rockchip.usb_uart
+                       Enable the uart passthrough on the designated usb port
+                       on Rockchip SoCs. When active, the signals of the
+                       debug-uart get routed to the D+ and D- pins of the usb
+                       port and the regular usb controller gets disabled.
+ 
        root=           [KNL] Root filesystem
                        See name_to_dev_t comment in init/do_mounts.c.
  
@@@ -4235,17 -4236,6 +4241,17 @@@
                        The default value of this parameter is determined by
                        the config option CONFIG_WQ_POWER_EFFICIENT_DEFAULT.
  
 +      workqueue.debug_force_rr_cpu
 +                      Workqueue used to implicitly guarantee that work
 +                      items queued without explicit CPU specified are put
 +                      on the local CPU.  This guarantee is no longer true
 +                      and while local CPU is still preferred work items
 +                      may be put on foreign CPUs.  This debug option
 +                      forces round-robin CPU selection to flush out
 +                      usages which depend on the now broken guarantee.
 +                      When enabled, memory and cache locality will be
 +                      impacted.
 +
        x2apic_phys     [X86-64,APIC] Use x2apic physical mode instead of
                        default x2apic cluster mode on platforms
                        supporting x2apic.