From: Linus Torvalds Date: Sat, 21 Oct 2006 23:52:40 +0000 (-0700) Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5cfc35cf79d46af998346e3d5cc66fa344d1af0e;p=linux-beck.git Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] x86-64: increase PHB1 split transaction timeout [PATCH] x86-64: Fix C3 timer test --- 5cfc35cf79d46af998346e3d5cc66fa344d1af0e