]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 06:44:14 +0000 (16:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Aug 2013 06:44:14 +0000 (16:44 +1000)
commit7ba4a751dcebe78c6be75a8614e948bfffa0f08e
tree84b8025f088faaa5f2acde3887eabd40640af65e
parentfcb71a1ae51398d914beeb33a32c5f4deb5b8595
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