Merge branch 'cryptsetup'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 16 Apr 2012 02:37:01 +0000 (04:37 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 16 Apr 2012 02:37:01 +0000 (04:37 +0200)
commitf1e3cd9290cd700f407a6d323454f75cd4c53730
tree54eadd70e9e2bf362d1eb2cdb009ef9f2b467504
parent0a23f1883ff3a046d6a375ad2d11c0e2c534e48e
parent08b7a087524ebbfa47f822d0fd4d8b69fdcc4be9
Merge branch 'cryptsetup'

Conflicts:
ChangeLog
ChangeLog
gen_initramfs.sh