Andrew Morton [Sat, 10 Sep 2016 10:36:33 +0000 (20:36 +1000)]
drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
This cast is no longer needed.
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Intel Linux Wireless <linuxwifi@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Tue, 13 Sep 2016 03:47:33 +0000 (13:47 +1000)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Tue, 13 Sep 2016 03:29:36 +0000 (13:29 +1000)]
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:28:00 +0000 (13:28 +1000)]
Merge remote-tracking branch 'rtc/rtc-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:26:28 +0000 (13:26 +1000)]
Merge remote-tracking branch 'coresight/next'
Stephen Rothwell [Tue, 13 Sep 2016 03:24:55 +0000 (13:24 +1000)]
Merge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:23:17 +0000 (13:23 +1000)]
Merge remote-tracking branch 'y2038/y2038'
Stephen Rothwell [Tue, 13 Sep 2016 03:17:55 +0000 (13:17 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:17:49 +0000 (13:17 +1000)]
Merge remote-tracking branch 'dma-buf/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:15:52 +0000 (13:15 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:13:14 +0000 (13:13 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:07:12 +0000 (13:07 +1000)]
Merge remote-tracking branch 'rpmsg/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:07:00 +0000 (13:07 +1000)]
Merge remote-tracking branch 'remoteproc/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:05:24 +0000 (13:05 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:03:44 +0000 (13:03 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 03:02:05 +0000 (13:02 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:51:38 +0000 (12:51 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:49:15 +0000 (12:49 +1000)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:47:30 +0000 (12:47 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:45:57 +0000 (12:45 +1000)]
Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:44:24 +0000 (12:44 +1000)]
Merge remote-tracking branch 'usb-serial/usb-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:42:48 +0000 (12:42 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Stephen Rothwell [Tue, 13 Sep 2016 02:41:11 +0000 (12:41 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:39:35 +0000 (12:39 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:37:59 +0000 (12:37 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:37:56 +0000 (12:37 +1000)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:36:19 +0000 (12:36 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:34:45 +0000 (12:34 +1000)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:34:41 +0000 (12:34 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:33:09 +0000 (12:33 +1000)]
Merge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:31:37 +0000 (12:31 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:30:04 +0000 (12:30 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:28:32 +0000 (12:28 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Boyd [Fri, 9 Sep 2016 21:48:47 +0000 (14:48 -0700)]
extcon: Add support for qcom SPMI PMIC USB id detection hardware
Some Qualcomm PMICs have a misc device that performs USB id pin
detection via an interrupt. When the interrupt triggers, we
should read the interrupt line to see if it has gone high or low.
If the interrupt is low then the ID pin is grounded, and if the
interrupt is high then the ID pin is being held high.
Cc: Roger Quadros <rogerq@ti.com>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
[cw00.choi: Edited the driver description and added the author information]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Chanwoo Choi [Tue, 16 Aug 2016 06:55:34 +0000 (15:55 +0900)]
extcon: Use the extcon_set_state_sync() instead of deprecated functions
This patch alters the renamed extcon API to set the state of the external
connectors instead of deprecated extcon_set_cable_state_().
Because the patch[1] modifies the function name to maintain the function
naming pattern.
- extcon_set_cable_state_() -> extcon_set_state_sync()
- extcon_get_cable_state_() -> extcon_get_state()
[1] https://lkml.org/lkml/2016/8/4/729
- extcon: Rename the extcon_set/get_state() to maintain the function naming pattern
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Colin Ian King [Wed, 17 Aug 2016 18:02:35 +0000 (19:02 +0100)]
extcon: axp288: Fix spelling mistake
This patch fixes the spelling mistake in dev_dbg messages.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
[cw00.choi: Modify the patch title/description]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Krzysztof Kozlowski [Wed, 17 Aug 2016 12:07:44 +0000 (14:07 +0200)]
extcon: max14577: Change Krzysztof Kozlowski's email to
Change my email address to kernel.org instead of Samsung one for the
purpose of any future contact. The copyrights remain untouched and are
attributed to Samsung.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Stephen Rothwell [Tue, 13 Sep 2016 02:26:25 +0000 (12:26 +1000)]
Merge remote-tracking branch 'kvm-ppc-paulus/kvm-ppc-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:24:52 +0000 (12:24 +1000)]
Merge remote-tracking branch 'kvm-mips/next'
Stephen Rothwell [Tue, 13 Sep 2016 02:23:19 +0000 (12:23 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Tue, 13 Sep 2016 02:21:37 +0000 (12:21 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:12:37 +0000 (12:12 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Tue, 13 Sep 2016 02:05:37 +0000 (12:05 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:04:04 +0000 (12:04 +1000)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 02:02:31 +0000 (12:02 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:53:17 +0000 (11:53 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Tue, 13 Sep 2016 01:51:21 +0000 (11:51 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:49:49 +0000 (11:49 +1000)]
Merge remote-tracking branch 'mailbox/mailbox-for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:48:16 +0000 (11:48 +1000)]
Merge remote-tracking branch 'devicetree/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:46:41 +0000 (11:46 +1000)]
Merge remote-tracking branch 'audit/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:45:07 +0000 (11:45 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:43:34 +0000 (11:43 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:41:59 +0000 (11:41 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:41:55 +0000 (11:41 +1000)]
Merge remote-tracking branch 'tpmdd/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:37:45 +0000 (11:37 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:36:05 +0000 (11:36 +1000)]
Merge remote-tracking branch 'keys/keys-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:36:01 +0000 (11:36 +1000)]
Merge remote-tracking branch 'integrity/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:31:53 +0000 (11:31 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:29:53 +0000 (11:29 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:28:21 +0000 (11:28 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:26:47 +0000 (11:26 +1000)]
Merge remote-tracking branch 'battery/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:25:12 +0000 (11:25 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:17:56 +0000 (11:17 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:16:19 +0000 (11:16 +1000)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:14:43 +0000 (11:14 +1000)]
Merge remote-tracking branch 'lightnvm/for-next'
Chris Zhong [Sat, 10 Sep 2016 02:15:44 +0000 (19:15 -0700)]
extcon: Introduce EXTCON_PROP_DISP_HPD property
EXTCON_PROP_DISP_HPD is need by display port, if the system has no hpd
interrupt, this property can be used.
- HPD (Hot Plug Detect) send the signal whether display device is on or off
to source device.
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
[cw00.choi: Add the description of HPD and full name of HPD]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Stephen Rothwell [Tue, 13 Sep 2016 01:05:43 +0000 (11:05 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:04:09 +0000 (11:04 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Tue, 13 Sep 2016 01:02:25 +0000 (11:02 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 01:00:49 +0000 (11:00 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:59:17 +0000 (10:59 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:50:13 +0000 (10:50 +1000)]
Merge remote-tracking branch 'kspp/for-next/kspp'
Stephen Rothwell [Tue, 13 Sep 2016 00:41:10 +0000 (10:41 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:38:38 +0000 (10:38 +1000)]
Merge remote-tracking branch 'drm-misc/topic/drm-misc'
Stephen Rothwell [Tue, 13 Sep 2016 00:37:29 +0000 (10:37 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:35:41 +0000 (10:35 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:34:07 +0000 (10:34 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:31:55 +0000 (10:31 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Tue, 13 Sep 2016 00:30:14 +0000 (10:30 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Tue, 13 Sep 2016 00:28:41 +0000 (10:28 +1000)]
Merge remote-tracking branch 'nand/nand/next'
Dave Airlie [Tue, 13 Sep 2016 00:28:17 +0000 (10:28 +1000)]
Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
This adds the ASoC codec interfaces for TDA998x HDMI audio from
Jyri Sarha.
* 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: dts: am335x-boneblack: Add HDMI audio support
drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding
drm/i2c: tda998x: Improve tda998x_configure_audio() audio related pdata
Stephen Rothwell [Tue, 13 Sep 2016 00:27:30 +0000 (10:27 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Tue, 13 Sep 2016 00:26:17 +0000 (10:26 +1000)]
Merge remote-tracking branch 'rdma/for-next'
Initial merge window candidates for 4.9
- Merge in hns-roce driver (required also pulling in the current net-next
from DaveM)
- Merge in shared mlx5 code (which DaveM also took)
# gpg: Signature made Fri 26 Aug 2016 01:19:54 AEST using RSA key ID
0E572FDD
# gpg: Can't check signature: public key not found
Dave Airlie [Tue, 13 Sep 2016 00:24:52 +0000 (10:24 +1000)]
Merge tag 'sunxi-drm-for-4.9' of https://git./linux/kernel/git/mripard/linux into drm-next
Allwinner DRM changes for 4.9
This tag adds the support of a new SoC to sun4i-drm (the Allwinner A33),
and the usual few fixes and enhancements
* tag 'sunxi-drm-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
drm/sun4i: add missing header dependencies
drm/sun4i: Add a DRC driver
drm/sun4i: backend: Handle the SAT
drm/sun4i: support A33 tcon
drm/sun4i: support TCONs without channel 1
drm/sun4i: Clear encoder->bridge if a bridge is not found
drm/sun4i: rgb: add missing calls to drm_panel_{prepare,unprepare}
drm/sun4i: Remove redundant dev_err call in sun4i_tcon_init_regmap()
drm/sun4i: Add bridge support
drm/sun4i: Move panel retrieval in RGB connector
drm/sun4i: Store TCON's device structure pointer
Stephen Rothwell [Tue, 13 Sep 2016 00:24:21 +0000 (10:24 +1000)]
Merge remote-tracking branch 'mac80211-next/master'
Stephen Rothwell [Tue, 13 Sep 2016 00:22:47 +0000 (10:22 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Dave Airlie [Tue, 13 Sep 2016 00:19:38 +0000 (10:19 +1000)]
Merge tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel into drm-next
* tag 'topic/drm-misc-2016-09-08' of git://anongit.freedesktop.org/drm-intel:
drm: Fix error path in drm_mode_page_flip_ioctl()
Revert "drm: Unify handling of blob and object properties"
drm/udl: implement usb_driver suspend/resume.
drm: fix signed integer overflow
drm/atomic: Reject properties not part of the object.
drm/doc: Add a few words on validation with IGT
Stephen Rothwell [Tue, 13 Sep 2016 00:13:46 +0000 (10:13 +1000)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Tue, 13 Sep 2016 00:12:36 +0000 (10:12 +1000)]
Merge remote-tracking branch 'ipvs-next/master'
Stephen Rothwell [Tue, 13 Sep 2016 00:08:18 +0000 (10:08 +1000)]
Merge remote-tracking branch 'netfilter-next/master'
Stephen Rothwell [Mon, 12 Sep 2016 23:59:29 +0000 (09:59 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Mon, 12 Sep 2016 23:50:21 +0000 (09:50 +1000)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 12 Sep 2016 23:46:17 +0000 (09:46 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 12 Sep 2016 23:44:34 +0000 (09:44 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 12 Sep 2016 23:36:11 +0000 (09:36 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 12 Sep 2016 23:26:03 +0000 (09:26 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 12 Sep 2016 23:24:49 +0000 (09:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 12 Sep 2016 23:24:46 +0000 (09:24 +1000)]
Merge branch 'dmi/master'
This page took 0.045649 seconds and 5 git commands to generate.