From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 17 Apr 2007 23:44:05 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: v2.6.21~64
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=71bfa15142177279ec63c0e400314bb81f3d7122;p=linux-2.6-omap-h63xx.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: Fix potential overflow in perfctr reservation
  [PATCH] x86: Fix gcc 4.2 _proxy_pda workaround
---

71bfa15142177279ec63c0e400314bb81f3d7122