]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:22:26 +0000 (13:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:22:26 +0000 (13:22 +1100)
commit3cbf663ea191c53a4d060841dd8ba8dd7ed22e70
tree41d45c8577cf15ee826d1d56341b590c1362dd03
parentefb2ae71c2525f4e10e2d85685aefb3557a44be9
parent35f8badc1cf652381fa3f82c1fbea39f4dbe87fd
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/radeon/evergreen_cs.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/omapdrm/Kconfig
drivers/gpu/drm/radeon/evergreen_cs.c
drivers/gpu/drm/radeon/r600_cs.c