Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel... kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:30:12 +0000 (08:30 -0400)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 28 Aug 2012 12:30:12 +0000 (08:30 -0400)

Trivial merge