]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tty/tty-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:59:00 +0000 (16:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 06:59:00 +0000 (16:59 +1000)
commitdd381b8556566b4fd2552632514be501ec333135
tree2330ca2c8324deef54faa88cfcda24a8824ccd35
parent39e75ede1b1ffa072d501975655e91de46ce6a20
parentb3e3bf2ef2c74f5ce5c19510edbbb9bfc1d249c2
Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/dma/Kconfig
arch/x86/kernel/early_printk.c
drivers/dma/Kconfig
drivers/dma/Makefile
include/asm-generic/vmlinux.lds.h
kernel/printk/printk.c