]> 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, 25 Jul 2012 00:43:28 +0000 (10:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:43:28 +0000 (10:43 +1000)
commitd97e22786074ca7f28c74a7462c1cb4782777bd2
tree1234889cc7ee8f20d7ed0fed7b3787a4b008737f
parent3ffb40dcef7877326354eba6a46b7ac4569b275b
parentb97ce28e9f6d65a800e5c2ee3a2a99c7795bef65
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
include/linux/pci_regs.h
drivers/gpu/drm/gma500/psb_drv.c
include/linux/pci_regs.h