]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge ra.kernel.org:/pub/scm/linux/kernel/git/rdunlap/linux-docs into docs-move
authorRandy Dunlap <rdunlap@xenotime.net>
Mon, 10 Oct 2011 17:47:14 +0000 (10:47 -0700)
committerRandy Dunlap <rdunlap@xenotime.net>
Mon, 10 Oct 2011 17:47:14 +0000 (10:47 -0700)
1  2 
drivers/gpu/drm/i915/i915_drv.c

Simple merge