summaryrefslogtreecommitdiffstats
path: root/include/drm/drm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 20:03:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-12 20:03:29 +0200
commit08d63aac436b2ad35d9e864b9ebb05bc8b9bb653 (patch)
treec72495139623f39b870fddab0aa366db79988b6d /include/drm/drm.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentgpio/basic_mmio: add missing include of spinlock_types.h (diff)
downloadlinux-08d63aac436b2ad35d9e864b9ebb05bc8b9bb653.tar.xz
linux-08d63aac436b2ad35d9e864b9ebb05bc8b9bb653.zip
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio/basic_mmio: add missing include of spinlock_types.h gpio/nomadik: fix sleepmode for elder Nomadik
Diffstat (limited to 'include/drm/drm.h')
0 files changed, 0 insertions, 0 deletions