Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 18:51:56 +0000 (10:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Nov 2010 18:51:56 +0000 (10:51 -0800)
commitbdbd01ac444bffb3c9aefed3059d12554059b320
tree1ee6fe62d019b2f487abe6d3250b348bb667fc3c
parent2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e
parent8c05cd08a7504b855c265263e84af61aabafa329
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