From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Apr 2011 22:07:19 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc6~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a6ab948e6500306dcb415ec80bff5f9b93f41b90;p=karo-tx-linux.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: ce4100: Configure IOAPIC pins for USB and SATA to level type
  x86: devicetree: Configure IOAPIC pin only once
  x86, setup: When probing memory with e801, use ax/bx as a pair
---

a6ab948e6500306dcb415ec80bff5f9b93f41b90