]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:24:58 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 01:24:58 +0000 (12:24 +1100)
commitb36c39ba2299cf11511b397514c3a01968ef99a6
treea93dfbc747785cd570a0128df943d23c982af895
parentb00f24dca34971fd7a0e31b9e88248ca7a7b2754
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