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

Conflicts:

	include/asm-x86/statfs.h

2008-10-13 17:13:56 +01:00

..

.gitignore

…

empty.c

…

file2alias.c

Automatic MODULE_ALIAS() for DMI match tables.

2008-10-13 16:05:06 +01:00

Makefile

…

mk_elfconfig.c

…

modpost.c

Marker depmod fix core kernel list

2008-10-06 16:34:19 -07:00

modpost.h

…

sumversion.c

…