diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-21 08:39:36 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-21 08:39:36 +0100 |
| commit | c879c634c928223765cf50103ddaf32f2a55fed0 (patch) | |
| tree | b49c79e703c6da708449b13b120517fb0c54fd7d /crypto/aead.c | |
| parent | ef71b1b87521ff93ed77b3e8f3e149afb392761c (diff) | |
| parent | b0fc5e043401df4cd243352f1030c4d23e767347 (diff) | |
| parent | a39c4ad1089be34d8dc66e926e93a52c44993a0a (diff) | |
Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus