tree 56f4aea5043aa4473e67412208b51230e497239a
parent b6a10886442364ceb20115bb3836764a7d99a83b
parent c547c77ee4d0408907847f64c403df1bf2f9c7a0
author Linus Torvalds <torvalds@woody.osdl.org> 1164763721 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1164763721 -0800

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: Use stricter in process stack check for unwinder
  [PATCH] i386: Fix compilation with UP genericarch
  [PATCH] x86-64: Fix warning in io_apic.c
  [PATCH] x86-64: work around gcc4 issue with -Os in Dwarf2 stack unwind
  [PATCH] x86_64: Align data segment to PAGE_SIZE boundary