tmp_suning_uos_patched/samples
David S. Miller 7cda4cee13 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-12-05 10:44:19 -05:00
..
auxdisplay License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
blackfin
bpf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-12-05 10:44:19 -05:00
configfs configfs: make config_item_type const 2017-10-19 16:15:15 +02:00
connector A relatively calm cycle for the docs tree again. 2017-11-13 08:25:06 -08:00
hidraw kbuild: remove all dummy assignments to obj- 2017-11-18 11:46:06 +09:00
hw_breakpoint
kdb
kfifo kfifo: clean up example to not use page_link 2017-07-12 16:26:01 -07:00
kobject
kprobes Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2017-11-13 13:05:08 -08:00
livepatch livepatch: add (un)patch callbacks 2017-10-19 10:08:56 +02:00
mei License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mic/mpssd Merge branch 'linus' into locking/core, to resolve conflicts 2017-11-07 10:32:44 +01:00
pktgen Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-11-04 09:26:51 +09:00
rpmsg
seccomp kbuild: remove all dummy assignments to obj- 2017-11-18 11:46:06 +09:00
sockmap kbuild: remove all dummy assignments to obj- 2017-11-18 11:46:06 +09:00
statx kbuild: remove all dummy assignments to obj- 2017-11-18 11:46:06 +09:00
timers License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
trace_events Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2017-11-15 10:14:11 -08:00
trace_printk
uhid kbuild: remove all dummy assignments to obj- 2017-11-18 11:46:06 +09:00
v4l [media] media: v4l2-pci-skeleton: Fix error handling path in 'skeleton_probe()' 2017-10-04 16:55:02 -03:00
vfio-mdev vfio-mdev/samples: make mdev_fops const and static 2017-10-02 12:40:05 -06:00
watchdog License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Kconfig livepatch: introduce shadow variable API 2017-09-14 23:06:12 +02:00
Makefile