A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse source 
Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2006-10-01 17:55:53 +01:00
commit 8a84fc15ae
4921 changed files with 310404 additions and 134614 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/mtd/Kbuild
View file

@ -1 +1,5 @@
header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
header-y += inftl-user.h
header-y += jffs2-user.h
header-y += mtd-abi.h
header-y += mtd-user.h
header-y += nftl-user.h