Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Aug 2012 12:14:00 +0000 (14:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Aug 2012 12:14:00 +0000 (14:14 +0200)

Trivial merge