Merge remote-tracking branch 'ms/kernel-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 May 2013 20:48:03 +0000 (20:48 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 May 2013 20:48:03 +0000 (20:48 +0000)

Trivial merge