tree dd212a11a29467034ec6e5a8cb7a343c4f0b69cc
parent cd05a1f818073a623455a58e756c5b419fc98db9
parent 92b35e910fe14e6e3a5d498157375fb55ea5fd03
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174175861 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174175861 -0700

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: Export _proxy_pda for gcc 4.2
  [PATCH] i386: Don't use the TSC in sched_clock if unstable
  [PATCH] x86-64: fix section mismatch warnings
  [PATCH] i386: Enforce GPLness of VMI ROM
  [PATCH] x86-64: wire up compat sched_rr_get_interval(2)
  [PATCH] i386: Update defconfig
  [PATCH] x86-64: Update defconfig