diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-10 17:58:46 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-10 17:58:46 +0100 |
| commit | 6b425660f45cdea177fe95388e081afa947b1506 (patch) | |
| tree | b0cc2cb7d86e228da458cd083a113d075541d700 /include/net/xfrm.h | |
| parent | 7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d (diff) | |
| parent | 0f101fa6bccdc797ddcee40fd4c55e879155a40f (diff) | |
| parent | 254248313aed7e6ff295ca21a82ca989b1f69c16 (diff) | |
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus