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)
commit5d7cb157025b3b4852f38e6e5e97d06ef12c1d78
tree09831b553687b51749ed99dbabaf3687a4e4bd2a
parentfc58fb180755cdeda3ce58776eef94a01b37a1c1
parent8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7
Merge git://git./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