]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 04:15:11 +0000 (15:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Mar 2013 04:15:11 +0000 (15:15 +1100)
commitc9ae5ed595f060270c830a0929fabf2fc217ed0c
tree8eaa122e44a0e55f63125285faa092b96a42ac33
parent6fb1b0262384c0f685de89fe55e31bd996960bb7
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