From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 17 Mar 2007 23:57:41 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
X-Git-Tag: firefly_0821_release~30602
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=360afb033277688f145030c80fd2853dbfaebba5;p=firefly-linux-kernel-4.4.55.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: 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
---

360afb033277688f145030c80fd2853dbfaebba5