www.infradead.org Git - users/hch/dma-mapping.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 9 Jun 2011 23:27:42 +0000 (16:27 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 9 Jun 2011 23:27:42 +0000 (16:27 -0700)

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  perf: Use make kernelversion instead of parsing the Makefile
  kbuild: Hack for depmod not handling X.Y versions
  kbuild: Move depmod call to a separate script
  kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL
  kbuild: Fix KERNELVERSION for empty SUBLEVEL or PATCHLEVEL
  kbuild: silence Nothing to be done for 'all' message

		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge