Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Apr 2007 23:44:05 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Apr 2007 23:44:05 +0000 (16:44 -0700)
commit71bfa15142177279ec63c0e400314bb81f3d7122
tree7b4c1c425a39d4dd70dba603b5db22140ef6db91
parent080dfbe176c8dd87fc8f27e2941f31171b738f60
parent1714f9bfc92d6ee67e84127332a1fae27772acfe
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