tree 73576f4970fe7f3653ebc07eb7b70f8c651e7522
parent 57bb55957432f20fd6e5bb5ddfbd9987439157ec
parent 0bd41dfc9fbbcf174d5336c1c9fc5ba917519761
author Linus Torvalds <torvalds@linux-foundation.org> 1306350227 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306350227 -0700

Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: Create a kernel-headers RPM
  rpm-pkg: Fix when current directory is a symlink
  Replace '-' in kernel version with '_'