| commit | bdbd01ac444bffb3c9aefed3059d12554059b320 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 16 10:51:56 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 16 10:51:56 2010 -0800 |
| tree | 1ee6fe62d019b2f487abe6d3250b348bb667fc3c | |
| parent | 2ebc8ec86fe0f3f3acf9ba9b41a368f819e7807e [diff] | |
| parent | 8c05cd08a7504b855c265263e84af61aabafa329 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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