diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-09 14:58:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-09 14:58:34 -0700 |
| commit | f4b9a988685da6386d7f9a72df3098bcc3270526 (patch) | |
| tree | 73432363e9f42b3d0d79d523c91058bb53555722 /net/8021q/vlan.h | |
| parent | 17d11ba14990d2bbaaec9c09a200b803679a968e (diff) | |
| parent | 32bc4820287a1a03982979515949e8ea56eac641 (diff) | |
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6:
UBI: compatible fallback in absense of sequence numbers
UBI: fix double free on error path
Diffstat (limited to 'net/8021q/vlan.h')
0 files changed, 0 insertions, 0 deletions