]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'md/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 02:24:09 +0000 (12:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 02:24:09 +0000 (12:24 +1000)
1  2 
drivers/md/md.c
fs/bio.c

diff --cc drivers/md/md.c
Simple merge
diff --cc fs/bio.c
Simple merge