summaryrefslogtreecommitdiff
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-07 18:43:28 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-07 18:43:28 (GMT)
commit78178c7d6e127fff6dba027315fd6914304b05cf (patch)
tree9b207197911feb57753bd9f1a9371851c8ca0991 /drivers/net/s2io.c
parent140236b4b1c749c9b795ea3d11558a0eb5a3a080 (diff)
parent023eb571a1d0eae738326042dcffa974257eb8c8 (diff)
downloadlinux-fsl-qoriq-78178c7d6e127fff6dba027315fd6914304b05cf.tar.xz
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: correctly update connector DPMS status in drm_fb_helper drm/radeon/kms: fix shared ddc handling drm/ttm: Allocate the page pool manager in the heap.
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions