summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-30 00:07:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-30 00:07:19 +0200
commita6ab948e6500306dcb415ec80bff5f9b93f41b90 (patch)
tree7c5d934ae840835b63dd38dbeb47adfc40927648 /kernel
parentMerge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentx86: ce4100: Configure IOAPIC pins for USB and SATA to level type (diff)
downloadlinux-a6ab948e6500306dcb415ec80bff5f9b93f41b90.tar.xz
linux-a6ab948e6500306dcb415ec80bff5f9b93f41b90.zip
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions