Alexandre Belloni
4042a1475e
rtc: mv: correct 24 hour error message ...
The driver can't accommodate the 12 hour mode but the error message states
that the 24 hour mode is not supported.
Also fix the typos (hour vs hours).
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
2015-06-25 01:13:45 +02:00
Merge branches 'acpi-init' and 'acpica'
2015-05-15 00:31:23 +02:00
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-06-08 08:47:08 -07:00
drivers/base: cacheinfo: handle absence of caches
2015-06-01 10:34:24 +09:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2015-06-12 11:35:19 -07:00
Bluetooth: ath3k: add support of 04ca:300f AR3012 device
2015-05-13 23:04:20 +02:00
mvebu fixes for 4.1 (part 3)
2015-06-01 17:03:44 +02:00
ipmi: Fix multi-part message handling
2015-05-05 19:37:22 -05:00
clk: si5351: Do not pass struct clk in platform_data
2015-05-08 11:22:30 -07:00
Initial ACPI support for arm64:
2015-04-24 08:23:45 -07:00
cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
2015-04-15 23:02:24 +02:00
cpuidle: Run tick_broadcast_exit() with disabled interrupts
2015-04-29 15:19:21 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2015-04-26 13:51:05 -07:00
dmaengine: Fix choppy sound because of unimplemented resume
2015-06-12 15:22:26 +05:30
dma-buf: cleanup dma_buf_export() to make it easily extensible
2015-04-21 14:47:16 +05:30
extcon: usb-gpio: register extcon device before IRQ registration
2015-04-27 11:06:05 +09:00
Merge branch 'stable/for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
2015-06-06 09:03:54 -07:00
gpio: gpio-kempld: Fix get_direction return value
2015-05-12 13:49:13 +02:00
Merge tag 'drm-intel-fixes-2015-06-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes
2015-06-12 10:11:50 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2015-05-21 17:23:11 -07:00
hwmon: (nct6683) Add missing sysfs attribute initialization
2015-05-29 17:47:42 -07:00
hwtracing /coresight
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
i2c: s3c2410: fix oops in suspend callback for non-dt platforms
2015-05-12 18:13:46 +02:00
Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-05-11 10:54:20 -07:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
iio: adc: twl6030-gpadc: Fix modalias
2015-05-23 12:30:52 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-05-31 11:31:42 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-06-09 15:05:27 -07:00
Merge git://git.infradead.org/intel-iommu
2015-06-12 11:28:57 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-14 15:38:57 -10:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
This is the bulk of GPIO changes for the v4.1 development
2015-04-18 08:22:10 -04:00
lguest: fix out-by-one error in address checking.
2015-05-27 09:57:21 -07:00
md: make sure MD_RECOVERY_DONE is clear before starting recovery/resync
2015-06-12 20:16:33 +10:00
media fixes for v4.1-rc3
2015-05-05 08:42:06 -07:00
ARM: SoC driver updates for v4.1
2015-04-22 09:18:17 -07:00
memstick: mspro_block: add missing curly braces
2015-04-17 09:04:09 -04:00
mfd: provide RTC resource in MT6397 MFD
2015-06-25 01:13:34 +02:00
Char/Misc driver patches for 4.1-rc1
2015-04-21 09:42:58 -07:00
mmc: atmel-mci: fix bad variable type for clkdiv
2015-05-18 09:04:42 +02:00
Two MTD fixes for 4.1:
2015-05-18 10:01:54 -07:00
net: igb: fix the start time for periodic output signals
2015-06-11 16:04:02 -07:00
ntb: initialize max_mw for Atom before using it
2015-06-11 09:27:24 -04:00
Driver core fixes for 4.1-rc7
2015-06-06 22:37:45 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-04-26 17:22:07 -07:00
parisc: %pf is only for function pointers
2015-04-24 13:45:54 +02:00
PCI: Preserve resource size during alignment reordering
2015-06-01 17:56:32 -05:00
ARM: SoC cleanups for v4.1
2015-04-22 09:04:39 -07:00
phy: phy-rcar-gen2: Fix USBHS_UGSTS_LOCK value
2015-05-12 20:57:19 +05:30
pinctrl: Fix gpio/pin mapping for Meson8b
2015-05-19 11:40:52 +02:00
thinkpad_acpi: Revert unintentional device attribute renaming
2015-05-20 02:18:12 -07:00
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
power: bq27x00_battery: Add missing MODULE_ALIAS
2015-05-01 23:01:48 +02:00
powercap / RAPL: Add support for Intel Skylake processors
2015-04-15 23:06:16 +02:00
pwm: img: Impose upper and lower timebase steps value
2015-05-19 16:07:40 +02:00
mfd: da9052: Fix broken regulator probe
2015-05-27 13:34:15 +01:00
rtc: mv: correct 24 hour error message
2015-06-25 01:13:45 +02:00
s390/zcrypt: Fix invalid domain handling during ap module unload
2015-05-13 09:57:29 +02:00
drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value
2015-04-15 16:35:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-05-31 11:31:42 -07:00
drivers: sh: Remove test for now unsupported sh7372
2015-04-27 13:08:14 +09:00
soc: mediatek: Add compile dependency to pmic-wrapper
2015-05-27 16:27:05 +02:00
Merge remote-tracking branches 'spi/fix/fsl-cpm', 'spi/fix/fsl-dspi' and 'spi/fix/fsl-espi' into spi-linus
2015-05-11 17:29:49 +01:00
SSB: Fix handling of ssb_pmu_get_alp_clock()
2015-06-09 16:38:06 +02:00
staging: rtl8712: fix stack dump
2015-05-31 11:54:25 +09:00
target: Use a PASSTHROUGH flag instead of transport_types
2015-05-30 19:58:11 -07:00
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into for-rc
2015-05-19 08:12:27 +08:00
TTY/Serial driver fixes for 4.1-rc7
2015-06-06 22:14:23 -07:00
USB-serial fixes for v4.1-rc7
2015-06-05 23:19:45 +09:00
vfio: Fix runaway interruptible timeout
2015-05-01 16:31:41 -06:00
target: Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem
2015-05-30 18:04:20 -07:00
backlight: pwm: Handle EPROBE_DEFER while requesting the PWM
2015-05-26 08:44:59 +01:00
virtio_pci: Clear stale cpumask when setting irq affinity
2015-06-04 14:47:49 +02:00
Merge git://www.linux-watchdog.org/linux-watchdog
2015-04-22 11:22:55 -07:00
xen/events: don't bind non-percpu VIRQs with percpu chip
2015-05-19 19:55:36 +01:00
4042a1475e