]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bcon/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:17:28 +0000 (15:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 05:17:28 +0000 (15:17 +1000)
commit32c6f6a4fc14ab09abeda5b2c848efc63b8a956f
treea8aebc21a98f4c27e9bf6af233a11867b9c8bbd9
parent97602e46414317ff92f44a4db1dca6a635b5e77e
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