]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
projects / mirror_ubuntu-bionic-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a211f3 1795cd9)
Merge 3.16-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jul 2014 22:26:47 +0000 (15:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Jul 2014 22:26:47 +0000 (15:26 -0700)
commit9f48c89862e39b7f33b44123fc425cf901c89428
tree373886606ada8c2e0c362afbcce490af27d21552tree
parent2a211f320ee3d86835b40efd2948642482d3c933commit | diff
parent1795cd9b3a91d4b5473c97f491d63892442212abcommit | diff
Merge 3.16-rc5 into char-misc-next

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/char/i8k.c diff1 | diff2 | blob | history
include/asm-generic/vmlinux.lds.h diff1 | diff2 | blob | history
ubuntu-bionic-kernel mirror