Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Jul 2012 08:40:34 +0000 (10:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Jul 2012 08:40:34 +0000 (10:40 +0200)
commit966e5b56c48c1676c0cbdf96c5ad659af7b4df56
treed31783b9e74a0f204f9fc1969141d7d1c65896d7
parent83d893a984a9e275e1e80b7f899c63b596ed12b3
parent7d9710774c48ec672f06195c038158bb1a8a6033
Merge remote-tracking branch 'origin/next' into kernel-update