summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-04-17 20:26:25 +0200
committerDavid S. Miller <davem@davemloft.net>2019-04-17 20:26:25 +0200
commit6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b (patch)
tree0a7976054052e793da782c2b7ec34eccfbf66449 /drivers/macintosh
parentMerge branch 's390-next' (diff)
parentMerge tag 'for-linus-5.1-2' of git://github.com/cminyard/linux-ipmi (diff)
downloadlinux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.tar.xz
linux-6b0a7f84ea1fe248df96ccc4dd86e817e32ef65b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict resolution of af_smc.c from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions