Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorHerbert Xu <herbert@gondor.apana.org.au>
Sat, 7 Sep 2013 02:53:35 +0000 (12:53 +1000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 7 Sep 2013 02:53:35 +0000 (12:53 +1000)
Merge upstream tree in order to reinstate crct10dif.


Trivial merge