Merge branch 'cryptodev' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Mar 2010 13:24:12 +0000 (14:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 10 Mar 2010 13:24:12 +0000 (14:24 +0100)

Trivial merge