Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 23:21:50 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 23:21:50 +0000 (16:21 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
  defconfig reduction
  kbuild: drop unifdef-y support
  archs: replace unifdef-y with header-y
  include: replace unifdef-y with header-y


Trivial merge