lsm: merge r29090, r29199
authorJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:23:51 +0000 (15:23 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:23:51 +0000 (15:23 +0000)
commit3b65fea66e2cca066df0f7de34f4b0724a3d15a9
tree909746f4f66eb1c60dd2063ac29fb409d83ecdcd
parent3aff24a368e2141ff9ac5943521576a9455c0a8d
lsm: merge r29090, r29199

SVN-Revision: 30216
net/lsm/Makefile
net/lsm/files/lsm.init