]> 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, 26 Sep 2012 02:50:08 +0000 (12:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 02:50:08 +0000 (12:50 +1000)
commit8f70c68d0b9e508603f9b91617e1af7688994a10
treee2d4349d72b282a0f126964974de90cffcfacfcb
parent96c75f5b547f63d64c46740a21521693d0ed9412
parent0179d361662367ab0f80b5822b162a1c0ba9b57d
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