diff options
| author | Stephen Rothwell <[email protected]> | 2009-03-30 00:10:27 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-03-30 17:10:49 +0000 |
| commit | 25c1a411e8a0a709abe3449866125dc290711ea8 (patch) | |
| tree | b9392dbf99afd1d72380e464d1a221eb20fd8566 /net/unix/af_unix.c | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| download | kernel-25c1a411e8a0a709abe3449866125dc290711ea8.tar.gz kernel-25c1a411e8a0a709abe3449866125dc290711ea8.zip | |
x86: fix mismerge in arch/x86/include/asm/timer.h
Signed-off-by: Stephen Rothwell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions