]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:36:11 +0000 (13:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 02:36:11 +0000 (13:36 +1100)
1  2 
drivers/md/md.c
drivers/md/raid5.c

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