Merge remote-tracking branch 'origin/kernel-update' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:38:21 +0000 (08:38 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:38:21 +0000 (08:38 -0400)

Trivial merge