diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 13:14:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 13:14:15 -0800 |
| commit | 5da0c7aad6271dd29526e3b49cbeb3bab9e8e491 (patch) | |
| tree | ae8e3d33eb5e71a83a9420b45eca9d7499b5a97f /include/linux/if_vlan.h | |
| parent | 615bb29ccbe9fa06d9f33b29d9c3f51340726656 (diff) | |
| parent | 9e66269d40229cd9823024120910a43af57a9d72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: iso and async streams: s/g list fix
Diffstat (limited to 'include/linux/if_vlan.h')
0 files changed, 0 insertions, 0 deletions