]> 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, 5 May 2008 00:11:24 +0000 (17:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 May 2008 00:11:24 +0000 (17:11 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kconfig-language.txt: remove bogus hint
  kconfig: fix MAC OS X warnings in menuconfig
  modpost: i2c aliases need no trailing wildcard


Trivial merge