]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:37:16 +0000 (12:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 02:37:16 +0000 (12:37 +1000)
commitf608d15cdfac7e0b1ad7351264b725b5b4e974f2
tree50df5b314a0c3f973f8f803a0cdcc42170f64764
parentb1f172edf512d91645e810e47389b1481ad81ef8
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
fs/bio.c