]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:30:55 +0000 (15:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:30:55 +0000 (15:30 +1100)
commit549ceb5393781baee4203a3f64c661c26f0840f1
treec3deb6bbe5f24db1e20aa4987858cdbf2f17de9d
parent01462bc2a7db2e8b2c0655cc1eda4d0bcf6790b5
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
init/do_mounts.c
kernel/printk.c