]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 10 Feb 2016 03:28:52 +0000 (14:28 +1100)]
Merge remote-tracking branch 'char-misc/char-misc-next'
Stephen Rothwell [Wed, 10 Feb 2016 03:21:38 +0000 (14:21 +1100)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 10 Feb 2016 03:20:12 +0000 (14:20 +1100)]
Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
Stephen Rothwell [Wed, 10 Feb 2016 03:10:04 +0000 (14:10 +1100)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:59:15 +0000 (13:59 +1100)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:56:06 +0000 (13:56 +1100)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:54:41 +0000 (13:54 +1100)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:51:51 +0000 (13:51 +1100)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:50:28 +0000 (13:50 +1100)]
Merge remote-tracking branch 'hsi/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:48:01 +0000 (13:48 +1100)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:46:36 +0000 (13:46 +1100)]
Merge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:35:30 +0000 (13:35 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:33:56 +0000 (13:33 +1100)]
Merge remote-tracking branch 'kvms390/next'
Stephen Rothwell [Wed, 10 Feb 2016 02:32:25 +0000 (13:32 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:21:16 +0000 (13:21 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 10 Feb 2016 02:21:10 +0000 (13:21 +1100)]
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:19:46 +0000 (13:19 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:19:42 +0000 (13:19 +1100)]
Merge remote-tracking branch 'clockevents/clockevents/next'
Stephen Rothwell [Wed, 10 Feb 2016 02:08:27 +0000 (13:08 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 10 Feb 2016 02:05:59 +0000 (13:05 +1100)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:04:34 +0000 (13:04 +1100)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 02:02:10 +0000 (13:02 +1100)]
Merge remote-tracking branch 'audit/next'
Stephen Rothwell [Wed, 10 Feb 2016 01:52:05 +0000 (12:52 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:50:41 +0000 (12:50 +1100)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:48:35 +0000 (12:48 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Wed, 10 Feb 2016 01:47:11 +0000 (12:47 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 10 Feb 2016 01:45:03 +0000 (12:45 +1100)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Wed, 10 Feb 2016 01:42:57 +0000 (12:42 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:41:29 +0000 (12:41 +1100)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:39:12 +0000 (12:39 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:37:05 +0000 (12:37 +1100)]
Merge remote-tracking branch 'mmc-uh/next'
Stephen Rothwell [Wed, 10 Feb 2016 01:34:56 +0000 (12:34 +1100)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:32:19 +0000 (12:32 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:30:53 +0000 (12:30 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 10 Feb 2016 01:29:05 +0000 (12:29 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:27:41 +0000 (12:27 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:26:14 +0000 (12:26 +1100)]
Merge remote-tracking branch 'hdlcd/for-upstream/hdlcd'
Stephen Rothwell [Wed, 10 Feb 2016 01:12:35 +0000 (12:12 +1100)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:10:13 +0000 (12:10 +1100)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:10:09 +0000 (12:10 +1100)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:07:37 +0000 (12:07 +1100)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Wed, 10 Feb 2016 01:04:42 +0000 (12:04 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 10 Feb 2016 01:02:37 +0000 (12:02 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:59:41 +0000 (11:59 +1100)]
Merge remote-tracking branch 'mac80211-next/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:58:14 +0000 (11:58 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:56:38 +0000 (11:56 +1100)]
Merge remote-tracking branch 'wireless-drivers-next/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:55:14 +0000 (11:55 +1100)]
Merge remote-tracking branch 'ipvs-next/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:49:11 +0000 (11:49 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:43:45 +0000 (11:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 10 Feb 2016 00:41:37 +0000 (11:41 +1100)]
Merge remote-tracking branch 'thermal-soc/next'
Stephen Rothwell [Wed, 10 Feb 2016 00:31:15 +0000 (11:31 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:29:42 +0000 (11:29 +1100)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:27:39 +0000 (11:27 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:25:01 +0000 (11:25 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:23:37 +0000 (11:23 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:23:33 +0000 (11:23 +1100)]
Merge branch 'dmi/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:22:09 +0000 (11:22 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Wed, 10 Feb 2016 00:20:39 +0000 (11:20 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:16:02 +0000 (11:16 +1100)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 10 Feb 2016 00:15:49 +0000 (11:15 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:06:27 +0000 (11:06 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:04:53 +0000 (11:04 +1100)]
Merge remote-tracking branch 'orangefs/for-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:03:23 +0000 (11:03 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 10 Feb 2016 00:01:15 +0000 (11:01 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:59:47 +0000 (10:59 +1100)]
Merge remote-tracking branch 'gfs2/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:59:33 +0000 (10:59 +1100)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Tue, 9 Feb 2016 23:58:09 +0000 (10:58 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Tue, 9 Feb 2016 23:56:38 +0000 (10:56 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Tue, 9 Feb 2016 23:46:36 +0000 (10:46 +1100)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Tue, 9 Feb 2016 23:45:08 +0000 (10:45 +1100)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 9 Feb 2016 23:45:03 +0000 (10:45 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Tue, 9 Feb 2016 23:43:34 +0000 (10:43 +1100)]
Merge remote-tracking branch 'btrfs-kdave/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:42:04 +0000 (10:42 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Tue, 9 Feb 2016 23:40:38 +0000 (10:40 +1100)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:39:14 +0000 (10:39 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Tue, 9 Feb 2016 23:37:49 +0000 (10:37 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 9 Feb 2016 23:36:18 +0000 (10:36 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:34:52 +0000 (10:34 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Tue, 9 Feb 2016 23:33:26 +0000 (10:33 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:32:03 +0000 (10:32 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:30:39 +0000 (10:30 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:29:12 +0000 (10:29 +1100)]
Merge remote-tracking branch 'h8300/h8300-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:19:38 +0000 (10:19 +1100)]
Merge remote-tracking branch 'arm64/for-next/core'
Geert Uytterhoeven [Tue, 9 Feb 2016 18:33:40 +0000 (10:33 -0800)]
Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB
The GPIO subsystem provides dummy GPIO consumer functions if GPIOLIB is
not enabled. Hence drivers that depend on GPIOLIB, but use GPIO consumer
functionality only, can still be compiled if GPIOLIB is not enabled.
If COMPILE_TEST is enabled, relax the dependency on GPIOLIB for the
recently introduced or relaxed symbols TOUCHSCREEN_GOODIX and
TOUCHSCREEN_COLIBRI_VF50.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Stephen Rothwell [Tue, 9 Feb 2016 23:18:15 +0000 (10:18 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:16:51 +0000 (10:16 +1100)]
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)]
Merge remote-tracking branch 'samsung-krzk/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:14:00 +0000 (10:14 +1100)]
Merge remote-tracking branch 'rockchip/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:12:27 +0000 (10:12 +1100)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Tue, 9 Feb 2016 23:10:59 +0000 (10:10 +1100)]
Merge remote-tracking branch 'qcom/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:10:55 +0000 (10:10 +1100)]
Merge remote-tracking branch 'omap-pending/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:09:13 +0000 (10:09 +1100)]
Merge remote-tracking branch 'omap/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:07:42 +0000 (10:07 +1100)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:06:19 +0000 (10:06 +1100)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Tue, 9 Feb 2016 23:04:55 +0000 (10:04 +1100)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:04:44 +0000 (10:04 +1100)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:03:21 +0000 (10:03 +1100)]
Merge remote-tracking branch 'bcm2835-dt/bcm2835-dt-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:03:18 +0000 (10:03 +1100)]
Merge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 9 Feb 2016 23:01:55 +0000 (10:01 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Tue, 9 Feb 2016 22:59:28 +0000 (09:59 +1100)]
Merge remote-tracking branch 'arm/for-next'