diff options
| author | Linus Torvalds <[email protected]> | 2010-09-07 21:38:54 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-09-07 21:38:54 +0000 |
| commit | add2b10f2ba15ac231181306c975e58d26f9bd54 (patch) | |
| tree | e3196992ab39adfa42a4fe4234f9f6b2ce0ba5b1 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
| parent | alpha: Fix printk format errors (diff) | |
| download | kernel-add2b10f2ba15ac231181306c975e58d26f9bd54.tar.gz kernel-add2b10f2ba15ac231181306c975e58d26f9bd54.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fix printk format errors
alpha: convert perf_event to use local_t
Fix call to replaced SuperIO functions
alpha: remove homegrown L1_CACHE_ALIGN macro
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions