Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts: litmus/sched_cedf.c
author: Glenn Elliott <gelliott@cs.unc.edu> 2012-03-04 19:47:13 -0500
committer: Glenn Elliott <gelliott@cs.unc.edu> 2012-03-04 19:47:13 -0500
commit: c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
tree: ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/dontdiff
parent: ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent: 6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
1 files changed, 68 insertions, 8 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index d9bcffd59433..dfa6fc6e4b28 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -1,6 +1,8 @@
 *.a
 *.aux
 *.bin
+*.bz2
+*.cis
 *.cpio
 *.csp
 *.dsp
@@ -8,6 +10,8 @@
 *.elf
 *.eps
 *.fw
+*.gcno
+*.gcov
 *.gen.S
 *.gif
 *.grep
@@ -19,14 +23,20 @@
 *.ko
 *.log
 *.lst
+*.lzma
+*.lzo
+*.mo
 *.moc
 *.mod.c
 *.o
 *.o.*
+*.order
 *.orig
 *.out
+*.patch
 *.pdf
 *.png
+*.pot
 *.ps
 *.rej
 *.s
@@ -39,16 +49,22 @@
 *.tex
 *.ver
 *.xml
+*.xz
 *_MODULES
 *_vga16.c
 *~
+\#*#
 *.9
-*.9.gz
 .*
+.*.d
 .mm
 53c700_d.h
 CVS
 ChangeSet
+GPATH
+GRTAGS
+GSYMS
+GTAGS
 Image
 Kerntypes
 Module.markers
@@ -57,11 +73,14 @@ PENDING
 SCCS
 System.map*
 TAGS
+aconf
+af_names.h
 aic7*reg.h*
 aic7*reg_print.c*
 aic7*seq.h*
 aicasm
 aicdb.h*
+altivec*.c
 asm-offsets.h
 asm_offsets.h
 autoconf.h*
@@ -76,6 +95,8 @@ btfixupprep
 build
 bvmlinux
 bzImage*
+capability_names.h
+capflags.c
 classlist.h*
 comp*.log
 compile.h*
@@ -83,7 +104,8 @@ conf
 config
 config-*
 config_data.h*
-config_data.gz*
+config.mak
+config.mak.autogen
 conmakehash
 consolemap_deftbl.c*
 cpustr.h
@@ -91,14 +113,18 @@ crc32table.h*
 cscope.*
 defkeymap.c
 devlist.h*
+dnotify_test
 docproc
+dslm
 elf2ecoff
 elfconfig.h*
+evergreen_reg_safe.h
 fixdep
 flask.h
 fore200e_mkfirm
 fore200e_pca_fw.c*
 gconf
+gconf.glade.h
 gen-devlist
 gen_crc32table
 gen_init_cpio
@@ -106,11 +132,19 @@ generated
 genheaders
 genksyms
 *_gray256.c
+hpet_example
+hugepage-mmap
+hugepage-shm
 ihex2fw
 ikconfig.h*
-initramfs_data.cpio
+inat-tables.c
-initramfs_data.cpio.gz
 initramfs_list
+int16.c
+int1.c
+int2.c
+int32.c
+int4.c
+int8.c
 kallsyms
 kconfig
 keywords.c
@@ -120,15 +154,19 @@ kxgettext
 lkc_defs.h
 lex.c
 lex.*.c
+linux
 logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
+mach
 mach-types
 mach-types.h
 machtypes.h
 map
+map_hugetlb
 maui_boot.h
+media
 mconf
 miboot*
 mk_elfconfig
@@ -137,30 +175,45 @@ mkbugboot
 mkcpustr
 mkdep
 mkprep
+mkregtable
 mktables
 mktree
 modpost
+modules.builtin
 modules.order
 modversions.h*
+nconf
 ncscope.*
 offset.h
 offsets.h
 oui.c*
+page-types
 parse.c
 parse.h
 patches*
 pca200e.bin
 pca200e_ecd.bin2
-piggy.gz
+perf.data
+perf.data.old
+perf-archive
 piggyback
+piggy.gzip
+piggy.S
 pnmtologo
 ppc_defs.h*
 pss_boot.h
 qconf
-raid6altivec*.c
+r100_reg_safe.h
-raid6int*.c
+r200_reg_safe.h
-raid6tables.c
+r300_reg_safe.h
+r420_reg_safe.h
+r600_reg_safe.h
+recordmcount
 relocs
+rlim_names.h
+rn50_reg_safe.h
+rs600_reg_safe.h
+rv515_reg_safe.h
 series
 setup
 setup.bin
@@ -169,7 +222,9 @@ sImage
 sm_tbl*
 split-include
 syscalltab.h
+tables.c
 tags
+test_get_len
 tftpboot.img
 timeconst.h
 times.h*
@@ -186,10 +241,14 @@ vdso32.so.dbg
 vdso64.lds
 vdso64.so.dbg
 version.h*
+vmImage
 vmlinux
 vmlinux-*
 vmlinux.aout
+vmlinux.bin.all
 vmlinux.lds
+vmlinuz
+voffset.h
 vsyscall.lds
 vsyscall_32.lds
 wanxlfw.inc
@@ -200,3 +259,4 @@ wakeup.elf
 wakeup.lds
 zImage*
 zconf.hash.c
+zoffset.h
author	Glenn Elliott <gelliott@cs.unc.edu>	2012-03-04 19:47:13 -0500
committer	Glenn Elliott <gelliott@cs.unc.edu>	2012-03-04 19:47:13 -0500
commit	c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
tree	ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/dontdiff
parent	ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent	6a00f206debf8a5c8899055726ad127dbeeed098 (diff)

diff --git a/Documentation/dontdiff b/Documentation/dontdiff index d9bcffd59433..dfa6fc6e4b28 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff
@@ -1,6 +1,8 @@
1	*.a	1	*.a
2	*.aux	2	*.aux
3	*.bin	3	*.bin
		4	*.bz2
		5	*.cis
4	*.cpio	6	*.cpio
5	*.csp	7	*.csp
6	*.dsp	8	*.dsp
@@ -8,6 +10,8 @@
8	*.elf	10	*.elf
9	*.eps	11	*.eps
10	*.fw	12	*.fw
		13	*.gcno
		14	*.gcov
11	*.gen.S	15	*.gen.S
12	*.gif	16	*.gif
13	*.grep	17	*.grep
@@ -19,14 +23,20 @@
19	*.ko	23	*.ko
20	*.log	24	*.log
21	*.lst	25	*.lst
		26	*.lzma
		27	*.lzo
		28	*.mo
22	*.moc	29	*.moc
23	*.mod.c	30	*.mod.c
24	*.o	31	*.o
25	.o.	32	.o.
		33	*.order
26	*.orig	34	*.orig
27	*.out	35	*.out
		36	*.patch
28	*.pdf	37	*.pdf
29	*.png	38	*.png
		39	*.pot
30	*.ps	40	*.ps
31	*.rej	41	*.rej
32	*.s	42	*.s
@@ -39,16 +49,22 @@
39	*.tex	49	*.tex
40	*.ver	50	*.ver
41	*.xml	51	*.xml
		52	*.xz
42	*_MODULES	53	*_MODULES
43	*_vga16.c	54	*_vga16.c
44	*~	55	*~
		56	\#*#
45	*.9	57	*.9
46	*.9.gz
47	.*	58	.*
		59	.*.d
48	.mm	60	.mm
49	53c700_d.h	61	53c700_d.h
50	CVS	62	CVS
51	ChangeSet	63	ChangeSet
		64	GPATH
		65	GRTAGS
		66	GSYMS
		67	GTAGS
52	Image	68	Image
53	Kerntypes	69	Kerntypes
54	Module.markers	70	Module.markers
@@ -57,11 +73,14 @@ PENDING
57	SCCS	73	SCCS
58	System.map*	74	System.map*
59	TAGS	75	TAGS
		76	aconf
		77	af_names.h
60	aic7reg.h	78	aic7reg.h
61	aic7reg_print.c	79	aic7reg_print.c
62	aic7seq.h	80	aic7seq.h
63	aicasm	81	aicasm
64	aicdb.h*	82	aicdb.h*
		83	altivec*.c
65	asm-offsets.h	84	asm-offsets.h
66	asm_offsets.h	85	asm_offsets.h
67	autoconf.h*	86	autoconf.h*
@@ -76,6 +95,8 @@ btfixupprep
76	build	95	build
77	bvmlinux	96	bvmlinux
78	bzImage*	97	bzImage*
		98	capability_names.h
		99	capflags.c
79	classlist.h*	100	classlist.h*
80	comp*.log	101	comp*.log
81	compile.h*	102	compile.h*
@@ -83,7 +104,8 @@ conf
83	config	104	config
84	config-*	105	config-*
85	config_data.h*	106	config_data.h*
86	config_data.gz*	107	config.mak
		108	config.mak.autogen
87	conmakehash	109	conmakehash
88	consolemap_deftbl.c*	110	consolemap_deftbl.c*
89	cpustr.h	111	cpustr.h
@@ -91,14 +113,18 @@ crc32table.h*
91	cscope.*	113	cscope.*
92	defkeymap.c	114	defkeymap.c
93	devlist.h*	115	devlist.h*
		116	dnotify_test
94	docproc	117	docproc
		118	dslm
95	elf2ecoff	119	elf2ecoff
96	elfconfig.h*	120	elfconfig.h*
		121	evergreen_reg_safe.h
97	fixdep	122	fixdep
98	flask.h	123	flask.h
99	fore200e_mkfirm	124	fore200e_mkfirm
100	fore200e_pca_fw.c*	125	fore200e_pca_fw.c*
101	gconf	126	gconf
		127	gconf.glade.h
102	gen-devlist	128	gen-devlist
103	gen_crc32table	129	gen_crc32table
104	gen_init_cpio	130	gen_init_cpio
@@ -106,11 +132,19 @@ generated
106	genheaders	132	genheaders
107	genksyms	133	genksyms
108	*_gray256.c	134	*_gray256.c
		135	hpet_example
		136	hugepage-mmap
		137	hugepage-shm
109	ihex2fw	138	ihex2fw
110	ikconfig.h*	139	ikconfig.h*
111	initramfs_data.cpio	140	inat-tables.c
112	initramfs_data.cpio.gz
113	initramfs_list	141	initramfs_list
		142	int16.c
		143	int1.c
		144	int2.c
		145	int32.c
		146	int4.c
		147	int8.c
114	kallsyms	148	kallsyms
115	kconfig	149	kconfig
116	keywords.c	150	keywords.c
@@ -120,15 +154,19 @@ kxgettext
120	lkc_defs.h	154	lkc_defs.h
121	lex.c	155	lex.c
122	lex.*.c	156	lex.*.c
		157	linux
123	logo_*.c	158	logo_*.c
124	logo_*_clut224.c	159	logo_*_clut224.c
125	logo_*_mono.c	160	logo_*_mono.c
126	lxdialog	161	lxdialog
		162	mach
127	mach-types	163	mach-types
128	mach-types.h	164	mach-types.h
129	machtypes.h	165	machtypes.h
130	map	166	map
		167	map_hugetlb
131	maui_boot.h	168	maui_boot.h
		169	media
132	mconf	170	mconf
133	miboot*	171	miboot*
134	mk_elfconfig	172	mk_elfconfig
@@ -137,30 +175,45 @@ mkbugboot
137	mkcpustr	175	mkcpustr
138	mkdep	176	mkdep
139	mkprep	177	mkprep
		178	mkregtable
140	mktables	179	mktables
141	mktree	180	mktree
142	modpost	181	modpost
		182	modules.builtin
143	modules.order	183	modules.order
144	modversions.h*	184	modversions.h*
		185	nconf
145	ncscope.*	186	ncscope.*
146	offset.h	187	offset.h
147	offsets.h	188	offsets.h
148	oui.c*	189	oui.c*
		190	page-types
149	parse.c	191	parse.c
150	parse.h	192	parse.h
151	patches*	193	patches*
152	pca200e.bin	194	pca200e.bin
153	pca200e_ecd.bin2	195	pca200e_ecd.bin2
154	piggy.gz	196	perf.data
		197	perf.data.old
		198	perf-archive
155	piggyback	199	piggyback
		200	piggy.gzip
		201	piggy.S
156	pnmtologo	202	pnmtologo
157	ppc_defs.h*	203	ppc_defs.h*
158	pss_boot.h	204	pss_boot.h
159	qconf	205	qconf
160	raid6altivec*.c	206	r100_reg_safe.h
161	raid6int*.c	207	r200_reg_safe.h
162	raid6tables.c	208	r300_reg_safe.h
		209	r420_reg_safe.h
		210	r600_reg_safe.h
		211	recordmcount
163	relocs	212	relocs
		213	rlim_names.h
		214	rn50_reg_safe.h
		215	rs600_reg_safe.h
		216	rv515_reg_safe.h
164	series	217	series
165	setup	218	setup
166	setup.bin	219	setup.bin
@@ -169,7 +222,9 @@ sImage
169	sm_tbl*	222	sm_tbl*
170	split-include	223	split-include
171	syscalltab.h	224	syscalltab.h
		225	tables.c
172	tags	226	tags
		227	test_get_len
173	tftpboot.img	228	tftpboot.img
174	timeconst.h	229	timeconst.h
175	times.h*	230	times.h*
@@ -186,10 +241,14 @@ vdso32.so.dbg
186	vdso64.lds	241	vdso64.lds
187	vdso64.so.dbg	242	vdso64.so.dbg
188	version.h*	243	version.h*
		244	vmImage
189	vmlinux	245	vmlinux
190	vmlinux-*	246	vmlinux-*
191	vmlinux.aout	247	vmlinux.aout
		248	vmlinux.bin.all
192	vmlinux.lds	249	vmlinux.lds
		250	vmlinuz
		251	voffset.h
193	vsyscall.lds	252	vsyscall.lds
194	vsyscall_32.lds	253	vsyscall_32.lds
195	wanxlfw.inc	254	wanxlfw.inc
@@ -200,3 +259,4 @@ wakeup.elf
200	wakeup.lds	259	wakeup.lds
201	zImage*	260	zImage*
202	zconf.hash.c	261	zconf.hash.c
		262	zoffset.h