]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 04:02:40 +0000 (14:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 04:02:40 +0000 (14:02 +1000)
commitaba82d1e01412371e13478d26689e031594551f6
tree83dbe5ea5e0cf3f34e3147830547af821bf618ab
parentd1562a59fda0f5efce47a57b0aec7225242b08b7
parentc0c6d3f37083bfe5fe4581bdd1a4b626444d64db
Merge remote-tracking branch 'md/for-next'

Conflicts:
drivers/md/raid0.c
fs/bio.c
block/blk-core.c
drivers/md/md.c
drivers/md/raid0.c