From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Mar 2009 00:10:27 +0000 (+1100)
Subject: x86: fix mismerge in arch/x86/include/asm/timer.h
X-Git-Tag: v2.6.30-rc1~620
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c1a411e8a0a709abe3449866125dc290711ea8;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed