From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 May 2008 00:11:24 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
X-Git-Tag: v2.6.26-rc2~77
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10ea18f0deb2372417c8e5be4d2ec79de1f65c4b;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* 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
---

10ea18f0deb2372417c8e5be4d2ec79de1f65c4b