From: Linus Torvalds <torvalds@linux-foundation.org>
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://git.cdn.openwrt.org/?a=commitdiff_plain;h=bdbd01ac444bffb3c9aefed3059d12554059b320;p=openwrt%2Fstaging%2Fblogic.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