Merge branch 'kernel-layer7-oom'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 30 Mar 2014 21:28:35 +0000 (23:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 30 Mar 2014 21:28:35 +0000 (23:28 +0200)
commitc5fb845c4eb6fdc4ef7d1e10495566a7689bf451
tree5cabbb2718e6393ca9805c7b3d6cb592af6c9168
parentc26a9ed25c6a3e81d42d824b4b7785f78f500eea
parentaf8c09ff3859a11cd04dc0ae14997fd004e85424
Merge branch 'kernel-layer7-oom'