From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Sep 2009 23:02:06 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ebc79c4f8da0f92efa968e0328f32334a2ce80cf;p=deliverable%2Flinux.git

Merge git://git./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
---

ebc79c4f8da0f92efa968e0328f32334a2ce80cf