Peter Hurley
2fa645cb27
of: Fix premature bootconsole disable with 'stdout-path' ...
Support for devicetree serial consoles via 'stdout-path' causes
bootconsoles to be disabled when the vt dummy console loads, since
there is no preferred console (the preferred console is not added
until the device is probed).
Ensure there is at least a preferred console, even if never matched.
Requires: "console: Fix console name size mismatch"
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Rob Herring <robh@kernel.org>
2015-03-10 10:27:21 -05:00
Merge branch 'acpi-video'
2015-03-06 01:29:16 +01:00
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
android: binder: fix binder mmap failures
2015-03-01 18:43:51 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
Merge branches 'pm-domains' and 'pm-cpufreq'
2015-03-06 01:29:31 +01:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2015-02-28 10:21:57 -08:00
Bluetooth: btusb: Fix issue with CSR based Intel Wireless controllers
2015-02-23 09:30:35 +02:00
ARM: SoC platform changes
2015-02-17 09:27:54 -08:00
ipmi: Fix a memory ordering issue
2015-02-19 20:58:42 -06:00
clk: at91: implement suspend/resume for the PMC irqchip
2015-03-04 22:11:17 +01:00
clocksource: pxa: Fix section mismatch
2015-02-25 10:28:55 +01:00
coresight: fix function etm_writel_cp14() parameter order
2015-02-04 10:42:55 -08:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
2015-03-06 13:43:33 -08:00
cpuidle / sleep: Use broadcast timer for states that stop local timer
2015-03-05 23:13:19 +01:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'
2015-02-13 21:39:06 +01:00
dmaengine: mmp_pdma: fix warning about slave caps
2015-03-05 22:15:35 +05:30
* A fix to sb_edac for proper detection on SNB machines
2015-02-19 11:18:14 -08:00
firewire: core: use correct vendor/model IDs
2015-02-02 21:56:03 +01:00
* Fix regression in DMI sysfs code for handling "End of Table" entry
2015-03-02 14:18:57 +01:00
gpio: tps65912: fix wrong container_of arguments
2015-02-23 15:40:32 +01:00
Merge tag 'drm-intel-fixes-2015-03-05' of git://anongit.freedesktop.org/drm-intel into drm-fixes
2015-03-07 07:40:17 +10:00
HID: microsoft: Add ID for NE7K wireless keyboard
2015-02-23 15:28:40 +01:00
Char / Misc patches for 3.20-rc1
2015-02-15 10:48:44 -08:00
hwmon: (ads7828) Check return value of devm_regmap_init_i2c
2015-02-22 20:10:30 -08:00
i2c: designware-baytrail: baytrail_i2c_acquire() might sleep
2015-03-07 01:08:26 +01:00
intel_idle: Add ->enter_freeze callbacks
2015-02-15 19:40:09 +01:00
Second round of IIO fixes for the 4.0 cycle (or round one part two really!)
2015-02-28 07:19:27 -08:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-22 17:42:14 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-02-21 12:59:04 -08:00
IOMMU Updates for Linux v3.20
2015-02-12 09:16:56 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-03 15:30:07 -08:00
leds: leds-gpio: Pass on error codes unmodified
2015-02-02 14:36:10 -08:00
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2015-02-11 12:56:40 -08:00
mcb: Fix error path of mcb_pci_probe
2015-02-03 15:48:51 -08:00
md: mark some attributes as pre-alloc
2015-02-25 11:38:46 +11:00
mm: gup: use get_user_pages_unlocked
2015-02-11 17:06:05 -08:00
i2o: move to staging
2015-02-03 15:58:39 -08:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
mei: make device disabled on stop unconditionally
2015-03-01 19:34:50 -08:00
The clock framework changes for 3.20 contain the usual driver additions,
2015-02-21 12:30:30 -08:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-03 15:30:07 -08:00
NFC: nci: Move NFCEE discovery logic
2015-02-04 09:15:18 +01:00
of: Fix premature bootconsole disable with 'stdout-path'
2015-03-10 10:27:21 -05:00
PCI: versatile: Update for list_for_each_entry() API change
2015-02-28 00:47:00 +01:00
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
USB patches for 3.20-rc1
2015-02-15 10:24:55 -08:00
This is the bulk of pin control changes for the v3.20 cycle:
2015-02-11 11:23:13 -08:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-21 11:12:07 -08:00
Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'
2015-02-21 04:29:16 +01:00
pwm: tegra: Use NSEC_PER_SEC
2015-02-18 08:40:29 +01:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
Merge branch 'irq-pm'
2015-03-06 01:29:05 +01:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
SCSI misc on 20150221
2015-02-21 19:16:42 -08:00
drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
2015-02-24 07:26:12 +09:00
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
treewide: Remove unnecessary SSB_DEVTABLE_END macro
2015-02-11 14:38:29 -08:00
staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel
2015-03-01 19:25:59 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-02-21 13:21:19 -08:00
thermal: Make sysfs attributes of cooling devices default attributes
2015-03-05 01:47:57 -04:00
TTY/Serial fixes for 4.0-rc3
2015-03-08 12:25:40 -07:00
USB fixes for 4.0-rc3
2015-03-08 12:47:18 -07:00
USB patches for 3.20-rc1
2015-02-15 10:24:55 -08:00
vfio-pci: Add device request interface
2015-02-10 12:38:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-03 15:30:07 -08:00
mm: gup: use get_user_pages_unlocked
2015-02-11 17:06:05 -08:00
virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.
2015-02-17 16:19:29 +10:30
watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND
2015-03-06 00:46:31 +01:00
xen-scsiback: mark pvscsi frontend request consumed only after last read
2015-02-23 16:30:25 +00:00
i2o: move to staging
2015-02-03 15:58:39 -08:00
2fa645cb27