]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:44:41 +0000 (15:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 05:44:41 +0000 (15:44 +1000)
commit35b129aa7192fb5e92929aede9504b29a0f2ff4a
treee5b2d7410493e201f3987bb1bf3f6a7bda239641
parent49647e4b977e47d50bbc627e9df750b87c6c8642
parente284f3493206d4268267db4557c7ee6f89ed2314
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig
Documentation/networking/netconsole.txt
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.c