diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-30 11:10:27 +1100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 10:10:49 -0700 |
| commit | 25c1a411e8a0a709abe3449866125dc290711ea8 (patch) | |
| tree | b9392dbf99afd1d72380e464d1a221eb20fd8566 /drivers/ps3/ps3av.c | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (diff) | |
| download | linux-dev-25c1a411e8a0a709abe3449866125dc290711ea8.tar.xz linux-dev-25c1a411e8a0a709abe3449866125dc290711ea8.zip | |
x86: fix mismerge in arch/x86/include/asm/timer.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/ps3/ps3av.c')
0 files changed, 0 insertions, 0 deletions