Merge remote-tracking branch 'ms/kernel-update' into next
authorArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 19:47:33 +0000 (21:47 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Thu, 16 May 2013 19:47:33 +0000 (21:47 +0200)

Trivial merge