]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:51:41 +0000 (16:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Apr 2013 06:51:41 +0000 (16:51 +1000)
commitb3e66b1073bc48b02aadff606c128eb1a98c40c7
tree2e017a8777d4d567ab902df56d60ccabe32d93a1
parentbdefb9f7550f0f1545a4fef5e851711c8859e4ee
parent06c6942645eb82a7f69ed0759e23b272c253cd3c
Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig
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