]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:09:00 +0000 (12:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 01:09:00 +0000 (12:09 +1100)
commit8e3f0f71f9cce4075fc34a364353a31766c92c1d
treef5c268c5edc7514e89bb0f74785866a1ece9a523
parent621a85e2c029b50f5b80eac8a5e8000434ca8620
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