diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 12:18:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 12:18:06 -0700 |
| commit | 8dca7ffe2cdbcf8a2f188c8230044c3225b70418 (patch) | |
| tree | 6192acd52c4bd0dcb0f502f35f94a8200ce6cf4c /security/selinux/xfrm.c | |
| parent | 945754a1754f9d4c2974a8241ad4f92fad7f3a6a (diff) | |
| parent | 3e14b50dd4a3178f4f635267a2706b5d4f8c61ee (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sb - Fix wrong assertions
ALSA: aw2 - Fix Oops at initialization
Diffstat (limited to 'security/selinux/xfrm.c')
0 files changed, 0 insertions, 0 deletions