mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-28 19:39:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
0d982de3e27e8091dfa62368cd3eefbc7c17c8a2
linux/drivers
History
Peng Ma 0d982de3e2 rtc: fsl-ftm-alarm: update acpi device id 
Original device id would conflict with crypto driver, change it.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200818063609.39859-1-ran.wang_1@nxp.com
2020-08-21 00:20:38 +02:00
..
accessibility
Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2020-08-06 14:56:11 -07:00
acpi
Merge tag 'acpi-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-08-15 08:18:22 -07:00
amba
…
android
…
ata
…
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-08-05 20:13:21 -07:00
auxdisplay
Merge tag 'auxdisplay-for-linus-v5.9-rc1' of git://github.com/ojeda/linux
2020-08-06 18:09:34 -07:00
base
Merge tag 'pm-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-08-07 13:13:09 -07:00
bcma
bcma: gpio: Use irqchip template
2020-08-02 18:26:51 +03:00
block
Merge tag 'block-5.9-2020-08-14' of git://git.kernel.dk/linux-block
2020-08-15 20:36:42 -07:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2020-07-31 15:11:52 -07:00
bus
Merge tag 'mips_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
2020-08-06 10:54:07 -07:00
cdrom
…
char
Merge tag 'v5.8' into drm-next
2020-08-11 11:58:31 +10:00
clk
Merge tag 'acpi-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-08-15 08:18:22 -07:00
clocksource
Merge tag 'mfd-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2020-08-15 08:09:38 -07:00
connector
…
counter
…
cpufreq
cpufreq: intel_pstate: Implement passive mode with HWP enabled
2020-08-11 17:29:45 +02:00
cpuidle
Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2020-08-07 10:33:50 -07:00
crypto
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2020-08-11 14:34:17 -07:00
dax
Merge tag 'libnvdimm-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2020-08-11 10:59:19 -07:00
dca
…
devfreq
PM / devfreq: Fix the wrong end with semicolon
2020-07-30 17:22:58 +09:00
dio
…
dma
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-08-07 21:14:30 -07:00
dma-buf
Merge tag 'locking-urgent-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2020-08-10 19:07:44 -07:00
edac
Merge tag 'edac_updates_for_5.9_pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
2020-08-15 08:25:41 -07:00
eisa
…
extcon
…
firewire
…
firmware
uaccess: add force_uaccess_{begin,end} helpers
2020-08-12 10:57:59 -07:00
fpga
…
fsi
…
gnss
…
gpio
Merge tag 'gpio-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio
2020-08-05 12:56:27 -07:00
gpu
Merge tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2020-08-14 16:00:09 -07:00
greybus
…
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
2020-08-10 16:33:54 -07:00
hsi
…
hv
Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
2020-08-14 13:31:25 -07:00
hwmon
Merge tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2020-08-14 16:00:09 -07:00
hwspinlock
…
hwtracing
…
i2c
Merge tag 'acpi-5.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2020-08-15 08:18:22 -07:00
i3c
…
ide
…
idle
Merge tag 'uninit-macro-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
2020-08-04 13:49:43 -07:00
iio
…
infiniband
mm/gup: remove task_struct pointer for all gup code
2020-08-12 10:58:04 -07:00
input
Merge tag 'sh-for-5.9' of git://git.libc.org/linux-sh
2020-08-15 18:50:32 -07:00
interconnect
Merge tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2020-08-05 11:43:47 -07:00
iommu
Merge branch 'akpm' (patches from Andrew)
2020-08-12 11:24:12 -07:00
ipack
…
irqchip
Merge tag 'irq-core-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2020-08-04 18:11:58 -07:00
isdn
…
leds
Merge tag 'leds-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds
2020-08-05 19:24:27 -07:00
lightnvm
…
macintosh
Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2020-08-07 10:33:50 -07:00
mailbox
iomap: constify ioreadX() iomem argument (as in generic implementation)
2020-08-14 19:56:57 -07:00
mcb
…
md
Merge tag 'block-5.9-2020-08-14' of git://git.kernel.dk/linux-block
2020-08-15 20:36:42 -07:00
media
Merge tag 'iommu-updates-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2020-08-11 14:13:24 -07:00
memory
Merge tag 'iommu-updates-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2020-08-11 14:13:24 -07:00
memstick
Merge tag 'mmc-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
2020-08-05 13:23:24 -07:00
message
…
mfd
Merge tag 'mfd-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2020-08-15 08:09:38 -07:00
misc
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-08-07 21:14:30 -07:00
mmc
Merge tag 'sched-fifo-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2020-08-06 11:55:43 -07:00
most
drivers: most: add USB adapter driver
2020-07-31 14:38:12 +02:00
mtd
Merge tag 'for-linus-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
2020-08-10 18:20:04 -07:00
mux
…
net
rtl818x: constify ioreadX() iomem argument (as in generic implementation)
2020-08-14 19:56:57 -07:00
nfc
…
ntb
ntb: intel: constify ioreadX() iomem argument (as in generic implementation)
2020-08-14 19:56:57 -07:00
nubus
…
nvdimm
mm: add thp_size
2020-08-14 19:56:56 -07:00
nvme
Merge tag 'for-5.9/block-merge-20200804' of git://git.kernel.dk/linux-block
2020-08-05 11:12:34 -07:00
nvmem
…
of
Merge tag 'mips_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
2020-08-06 10:54:07 -07:00
opp
Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
2020-08-04 12:44:53 +02:00
oprofile
…
parisc
Merge branch 'parisc-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
2020-08-12 12:41:15 -07:00
parport
…
pci
Merge tag 'pci-v5.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2020-08-07 18:48:15 -07:00
pcmcia
…
perf
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2020-08-07 13:35:51 -07:00
phy
…
pinctrl
Merge tag 'pinctrl-v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
2020-08-09 12:52:28 -07:00
platform
Merge tag 'linux-watchdog-5.9-rc1' of git://www.linux-watchdog.org/linux-watchdog
2020-08-12 12:13:44 -07:00
pnp
…
power
Merge tag 'for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2020-08-07 21:27:37 -07:00
powercap
Merge tag 'sched-fifo-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2020-08-06 11:55:43 -07:00
pps
…
ps3
…
ptp
ptp: only allow phase values lower than 1 period
2020-08-05 12:06:44 -07:00
pwm
Merge tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2020-08-14 16:00:09 -07:00
rapidio
rapidio/rio_mport_cdev: use array_size() helper in copy_{from,to}_user()
2020-08-12 10:58:01 -07:00
ras
…
regulator
Merge remote-tracking branch 'regulator/for-5.9' into regulator-next
2020-07-30 23:27:08 +01:00
remoteproc
Merge tag 'rproc-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc
2020-08-11 11:17:45 -07:00
reset
…
rpmsg
…
rtc
rtc: fsl-ftm-alarm: update acpi device id
2020-08-21 00:20:38 +02:00
s390
s390/pkey: remove redundant variable initialization
2020-08-11 18:16:31 +02:00
sbus
…
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2020-08-14 16:01:59 -07:00
sfi
…
sh
iomap: constify ioreadX() iomem argument (as in generic implementation)
2020-08-14 19:56:57 -07:00
siox
…
slimbus
…
soc
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-08-07 21:14:30 -07:00
soundwire
…
spi
Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2020-08-06 14:27:31 -07:00
spmi
…
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-08-05 20:13:21 -07:00
staging
Merge tag 'pci-v5.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
2020-08-07 18:48:15 -07:00
target
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2020-08-14 16:01:59 -07:00
tc
…
tee
…
thermal
Merge tag 'mfd-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
2020-08-15 08:09:38 -07:00
thunderbolt
thunderbolt: merge fix for kunix_resource changes
2020-08-09 11:06:10 -07:00
tty
Merge tag 'tty-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2020-08-06 14:56:11 -07:00
uio
…
usb
Merge tag 'media/v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2020-08-07 13:00:53 -07:00
vdpa
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2020-08-11 14:34:17 -07:00
vfio
Merge tag 'vfio-v5.9-rc1' of git://github.com/awilliam/linux-vfio
2020-08-12 12:09:36 -07:00
vhost
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2020-08-11 14:34:17 -07:00
video
Merge tag 'pwm/for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
2020-08-14 16:00:09 -07:00
virt
…
virtio
virtio: pci: constify ioreadX() iomem argument (as in generic implementation)
2020-08-14 19:56:57 -07:00
visorbus
…
vlynq
…
vme
…
w1
…
watchdog
Merge tag 'linux-watchdog-5.9-rc1' of git://www.linux-watchdog.org/linux-watchdog
2020-08-12 12:13:44 -07:00
xen
Merge tag 'for-linus-5.9-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
2020-08-14 13:34:37 -07:00
zorro
…
Kconfig
…
Makefile
…