tree 927da44f6b841c1fd8b5c7f905cd5c44ee63b79a
parent eb28062f131b0a1da32b2554fd819af5221040de
parent 2cb1e1257fb4d4d52c97e763ab262c2295aea4a8
author Linus Torvalds <torvalds@linux-foundation.org> 1209946284 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1209946284 -0700

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