]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Oct 2010 17:19:24 +0000 (10:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Oct 2010 17:19:24 +0000 (10:19 -0700)
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: fix oldnoconfig to do the right thing
  kconfig: Temporarily disable dependency warnings
  kconfig: delay symbol direct dependency initialization


Trivial merge