Paul Mundt a6b5825aa7 Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux ... Conflicts: drivers/video/omap2/dss/dsi.c drivers/video/omap2/dss/dss_features.c drivers/video/omap2/dss/dss_features.h Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-05-24 15:35:54 +09:00
..
alpha	Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'	2011-05-20 13:10:22 -07:00
arm	Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux	2011-05-24 15:35:54 +09:00
avr32
blackfin	Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'	2011-05-20 13:10:22 -07:00
cris	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
frv
h8300
ia64	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
m32r
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
microblaze
mips	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-05-23 12:33:02 -07:00
mn10300
parisc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6	2011-05-22 12:38:40 -07:00
powerpc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
score
sh	sh: Ignore R_SH_NONE module relocations.	2011-05-23 17:09:30 +09:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6	2011-05-22 22:06:24 -07:00
tile
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-05-23 09:12:26 -07:00
unicore32
x86	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-05-23 15:39:34 -07:00
xtensa
.gitignore
Kconfig