diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 09:08:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 09:08:19 -0700 |
| commit | e0c6b8a17fb3d4a740386b380ea72aa8388fbf2f (patch) | |
| tree | 45d20c5d14de3ac03ce4a3ca14c4a41dff6db7ec /net/l2tp/l2tp_ppp.c | |
| parent | 710421cc7d295cc59eb2676fe2ba3bc3252c124e (diff) | |
| parent | fda5fe19725edd6805f2fd742235d1a0d0ba93f5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
apm-emulation: apm_mutex breaks ACK; remove it
APM: take over maintainership
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
0 files changed, 0 insertions, 0 deletions