Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds...

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (582 commits)
  Revert "module: drop the lock while waiting for module to complete initialization."
  drivers/net/usb/asix.c: Fix pointer cast.
  be2net: Bug fix to avoid disabling bottom half during firmware upgrade.
  proc_dointvec: write a single value
  hso: add support for new products
  Phonet: fix potential use-after-free in pep_sock_close()
  alpha: simplify and optimize sched_find_first_bit
  alpha: invoke oom-killer from page fault
  Convert alpha to use clocksources instead of arch_gettimeoffset
  driver core: add devname module aliases to allow module on-demand auto-loading
  RDMA/nes: Fix incorrect unlock in nes_process_mac_intr()
  ath9k: remove VEOL support for ad-hoc
  ath9k: change beacon allocation to prefer the first beacon slot
  auxdisplay: section cleanup in cfag12864bfb driver
  nuc900fb: release correct mem region
  fb_defio: fix for non-dirty ptes
  sgivwfb: fix sections
  s3c2410fb: fix sections
  hitfb: fix sections
  fbdev: move FBIO_WAITFORVSYNC to linux/fb.h
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --cc arch/x86/include/asm/msr-index.h
Simple merge