]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 22:37:21 +0000 (15:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 22:37:21 +0000 (15:37 -0700)
commitc1518f12bab97a6d409a25aaccb02dc8895800f3
tree3ab9b4f232588fd11feda8705cc87597a2bcb72d
parenta094c0afc3515aaf962dd0793f3b23fe67e6b192
parentcbab05f041a4cff6ca15856bdd35238b282b64eb
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  gconfig: fix build failure on fedora 13
scripts/kconfig/Makefile