From: Linus Torvalds Date: Tue, 16 Nov 2010 18:51:56 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2.6.37-rc2-00012-gbdbd01a;p=deliverable%2Flinux.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: fix offset check for sysfs mmapped files --- bdbd01ac444bffb3c9aefed3059d12554059b320