git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 831fab2 4e2514c)
Merge branch 'kernel-2.6.34' into vpn-nat: vpn-nat needs 2.6.34
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Fri, 18 Jun 2010 09:00:49 +0000 (11:00 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Fri, 18 Jun 2010 09:00:49 +0000 (11:00 +0200)
Conflicts:
packages/kernel/kernel-2.6.34-i686-PAE.config


Trivial merge
libi2ncommon: Common functions used in Intra2net programs