]> err.no Git - linux-2.6/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 18:32:21 +0000 (11:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 18:32:21 +0000 (11:32 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  Don't clean bounds.h and asm-offsets.h
  kconfig: incorrect 'len' field initialisation ?
  kernel-doc: allow unnamed bit-fields
  kbuild: filter away debug symbols from kernel symbols
  Remove *.rej pattern from .gitignore
  MAINTAINERS: document names of new kbuild trees
  kbuild: disable modpost warnings for linkonce sections
  kbuild: escape meta characters in regular expression in make TAGS

1  2 
MAINTAINERS
Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge