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)
commit8bec7790904905339ec70cb41ec3b56ce31b3349
treea6bc57ede7284a257d54018dd44576aa6c9062b6
parent593948a8efaa9c53547b5c44e11ed1b1c69814be
parent47577eb38527c96d8edc712e6470f7984b43635f
Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update