From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sat, 7 Sep 2013 02:53:35 +0000 (+1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: v3.12-rc1~108^2~1
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.
---

eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6