diff options
author | Michael Young <m.a.young@durham.ac.uk> | 2010-10-21 19:02:44 +0100 |
---|---|---|
committer | Michael Young <m.a.young@durham.ac.uk> | 2010-10-21 19:02:44 +0100 |
commit | 9dced2eb0aa940c57300ab0e26fca08afc364ceb (patch) | |
tree | 8206c464f4b81b6113dd0f2d580f4da216c3b58a /l2tp-fix-oops-in-pppol2tp_xmit.patch | |
parent | 75dfde8b27d15fce8a8b319545a07d16b504f140 (diff) | |
parent | f8e3fe8229d0f6fb0330694f5ec1621417c0dc62 (diff) | |
download | dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.tar.gz dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.tar.xz dom0-kernel-9dced2eb0aa940c57300ab0e26fca08afc364ceb.zip |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'l2tp-fix-oops-in-pppol2tp_xmit.patch')
0 files changed, 0 insertions, 0 deletions