tree 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418
parent dcbb5593d980bbf4ceef320f8c75210398ed84db
parent 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2
author Linus Torvalds <torvalds@linux-foundation.org> 1253487726 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253487726 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
  includecheck fix: x86, cpu/common.c
  includecheck fix: kernel/trace, ring_buffer.c
  includecheck fix: include/linux, ftrace.h
  includecheck fix: include/linux, page_cgroup.h
  includecheck fix: include/linux, aio.h
  includecheck fix: include/drm, drm_memory.h
  includecheck fix: include/acpi, acpi_bus.h
  includecheck fix: drivers/xen, evtchn.c
  includecheck fix: drivers/video, vgacon.c
  includecheck fix: drivers/scsi, ibmvscsi.c
  includecheck fix: drivers/scsi, libfcoe.c
  includecheck fix: x86, shadow.c
  includecheck fix: x86, traps.c
  includecheck fix: um, helper.c
  includecheck fix: s390, sys_s390.c