]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'block/for-next'
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 15:26:26 +0000 (16:26 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 15:26:26 +0000 (16:26 +0100)
1  2 
drivers/block/loop.c
fs/fscache/object.c

Simple merge
Simple merge