tree 43ac35f5cfce4d2090bfbf429558ed1bafa2c51a
parent 1b3cba8e60c67c968d108ac55c77e32c1928dec3
parent f8a45704f5bd5f037c8e4a75172cab1476fc0447
author Linus Torvalds <torvalds@linux-foundation.org> 1213300532 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213300532 -0700

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: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
  x86, lockdep: fix "WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()"
  x86: fix an incompatible pointer type warning on 64-bit compilations
  x86: fix lockdep warning during suspend-to-ram
  x86: fix unused variable 'loops' warning in arch/x86/boot/a20.c
  Revert "x86: fix ioapic bug again"
  x86: fix asm warning in head_32.S
  x86: fix endless page faults in mount_block_root for Linux 2.6
  geode: fix modular build