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)

Trivial merge