]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2008 22:00:27 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 May 2008 22:00:27 +0000 (15:00 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  Kconfig: introduce ARCH_DEFCONFIG to DEFCONFIG_LIST
  .gitignore: match ncscope.out
  scripts/ver_linux use 'gcc -dumpversion'


Trivial merge