repo.or.cz
/
wrt350n-kernel.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git]
/
include
/
asm-mn10300
/
Kbuild
blob
c2c8dfd392bf660048749dee1c3440e10fecc2f6
1
include include/asm-generic/Kbuild.asm
2
<<<<<<< HEAD:include/asm-mn10300/Kbuild
3
4
unifdef-y += termios.h
5
unifdef-y += ptrace.h
6
unifdef-y += page.h
7
=======
8
>>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-mn10300/Kbuild