]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:32:57 +0000 (12:32 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:32:57 +0000 (12:32 +1000)
commitfadd4fbeffa5803d6291a047cd8a7e0e66be08c0
tree834e2885542ee17347990ccbbb8e9c97506a4114
parent36018f153297768dfd72f8cea3a055b533ca9247
parente284f3493206d4268267db4557c7ee6f89ed2314
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig
Documentation/networking/netconsole.txt
block/partitions/Makefile
block/partitions/check.c
block/partitions/check.h
drivers/block/Kconfig
drivers/block/Makefile
drivers/net/netconsole.c
include/linux/console.h
include/linux/mount.h
init/do_mounts.c
kernel/printk/printk.c