]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 04:49:50 +0000 (15:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 04:49:50 +0000 (15:49 +1100)
commit5a35c7fe9a59cde8fd909fcb5a70b525e0af9056
tree23f816584da107859c02e9f4bb6580d2822b11d2
parent61e1188821d7642a0adac9f3729115832e076928
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