diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:09:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:09:18 -0700 |
| commit | 85afd82780df133f03185aec7943ee3e0ed56a7b (patch) | |
| tree | da1513f97a50a482e06ffbae2251d9461e8ca1ed /drivers/w1 | |
| parent | a7c367b95a9d8e65e0f0e7da31f700a556794efb (diff) | |
| parent | 5b31aee9d72f529ee6b60e8d66967f817a0e39fc (diff) | |
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/r600: set correct pitch for 4 byte copy
drm/radeon: consolidate family flags used in pciids.
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions