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)
commit9470a758c0b76ddb94732a6b8f80cc7812ad4e3b
tree66ff8bb5d4e4472ed27b96b998f41be12319ae7f
parent831fab238264c2473df60e843da77131d819f642
parent4e2514c658207d7b805d686a8119073a63ad6e15
Merge branch 'kernel-2.6.34' into vpn-nat: vpn-nat needs 2.6.34

Conflicts:
packages/kernel/kernel-2.6.34-i686-PAE.config