David Woodhouse
8a84fc15ae
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
...
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-10-01 17:55:53 +01:00
David Woodhouse
9663265626
[MTD] Remove #ifndef __KERNEL__ hack in <mtd/mtd-abi.h>
...
Now that we have headers_install, we don't need this crap.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-09-25 21:52:21 +01:00
David Woodhouse
fadcfa33b6
[HEADERS] One line per header in Kbuild files to reduce conflicts
...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-09-19 12:43:58 +01:00
David Woodhouse
8555255f0b
Add generic Kbuild files for 'make headers_install'
...
This adds the Kbuild files listing the files which are to be installed by
the 'headers_install' make target, in generic directories.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2006-06-18 12:14:01 +01:00
