diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 19:45:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 19:45:40 -0800 |
| commit | 55b02d2f4445ad625213817a1736bf2884d32547 (patch) | |
| tree | 7661537f37443c952d594821761cc11e52e5514e /fs/proc/uptime.c | |
| parent | 2240a7bb479c38434bd636da9ce6afbd3f49447a (diff) | |
| parent | cd5cfce856684e13b9b57d46b78bb827e9c4da3c (diff) | |
| download | linux-55b02d2f4445ad625213817a1736bf2884d32547.tar.bz2 | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon/kms: add some new pci ids
Diffstat (limited to 'fs/proc/uptime.c')
0 files changed, 0 insertions, 0 deletions