From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Nov 2010 22:01:33 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: upstream/snapshot3+hdmi~12446
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5c13537b0153010b4f65b9c55faa78a4c151c93;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: sysfs: fix printk warnings
  PCI: fix pci_bus_alloc_resource() hang, prefer positive decode
  PCI: read current power state at enable time
  PCI: fix size checks for mmap() on /proc/bus/pci files
  x86/PCI: coalesce overlapping host bridge windows
  PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
---

e5c13537b0153010b4f65b9c55faa78a4c151c93