From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Oct 2010 15:54:21 +0000 (-0700)
Subject: Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.37-rc1~177
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91151240ed8e97cc4457dae4094153c2744f1eb8;p=pandora-kernel.git

Merge branch 'x86-irq-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, 32-bit: Align percpu area and irq stacks to THREAD_SIZE
  x86: Move alloc_desk_mask variables inside ifdef
  x86-32: Align IRQ stacks properly
  x86: Remove CONFIG_4KSTACKS
  x86: Always use irq stacks

Fixed up trivial conflicts in include/linux/{irq.h, percpu-defs.h}
---

91151240ed8e97cc4457dae4094153c2744f1eb8
Reading git-diff-tree failed