From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Aug 2010 23:21:50 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
X-Git-Tag: v2.6.36-rc1~8
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=5d7cb157025b3b4852f38e6e5e97d06ef12c1d78

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup

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

5d7cb157025b3b4852f38e6e5e97d06ef12c1d78