diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 12:06:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 12:06:27 -0700 |
| commit | 74e8f346d59074147c564d9c1ffd6caf18286516 (patch) | |
| tree | 9903bba71a4c9bf60c2000f5cfa682840f04297f /net/8021q/vlan.c | |
| parent | 7da6cd8bdfe13fecc061b868dda57ee1a3a051f4 (diff) | |
| parent | 6e420b7e26dd539f1f78fe920d295b022a2d99c8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Add support for 1533 bridge to alim1535_wdt
[WATCHDOG] Add a 00-INDEX file to Documentation/watchdog/
[WATCHDOG] Eurotechwdt.c - clean-up comments
Diffstat (limited to 'net/8021q/vlan.c')
0 files changed, 0 insertions, 0 deletions