git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7b39f90 537b60d)

author	David S. Miller <davem@davemloft.net>
	Wed, 19 May 2010 06:01:55 +0000 (23:01 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 19 May 2010 06:01:55 +0000 (23:01 -0700)
commit	2ec8c6bb5d8f3a62a79f463525054bae1e3d4487
tree	fa7f8400ac685fb52e96f64997c7c682fc2aa021	tree \| snapshot
parent	7b39f90fabcf9e2af0cd79d0a60440d821e22b56	commit \| diff
parent	537b60d17894b7c19a6060feae40299d7109d6e7	commit \| diff

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
include/linux/mod_devicetable.h
scripts/mod/file2alias.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/a2065.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ariadne.c	diff1 \|	diff2 \|	blob \| history
drivers/net/zorro8390.c	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
include/linux/mod_devicetable.h	diff1 \|	diff2 \|	blob \| history
scripts/mod/file2alias.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver