Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:17:25 +0000 (23:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 7 Jul 2012 21:17:25 +0000 (23:17 +0200)
commit08b4415ef2efe8a22a39f5e836099269fa024738
treef331cc49f9cb1c33b737110004da8128e2239b21
parent44fd6d2bb50f728b1ea772b9c184cfcca872b568
parentace40c90eceaf77ed20ba39a45a2f883aaafa3fe
Merge remote-tracking branch 'origin/next' into kernel-update