diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 16:16:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 16:16:35 -0800 |
| commit | 9232d5876e83921414de65d82edd1098258f6680 (patch) | |
| tree | e174b2a4fe535f5e5386ad0c8e435c24c6c99c04 /net/bridge/br_if.c | |
| parent | 2fdb611d3102509e31ef21c79fc91f97f300b9c3 (diff) | |
| parent | c7f570a5eca59575572ee231390df727df207bda (diff) | |
Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix pci.c kernel compilation breakage.
Diffstat (limited to 'net/bridge/br_if.c')
0 files changed, 0 insertions, 0 deletions