Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 19:03:47 +0000 (12:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 19:03:47 +0000 (12:03 -0700)
commit62af8163f9caa5b21996338ccd2564dfd727670e
tree73576f4970fe7f3653ebc07eb7b70f8c651e7522
parent57bb55957432f20fd6e5bb5ddfbd9987439157ec
parent0bd41dfc9fbbcf174d5336c1c9fc5ba917519761
Merge branch 'packaging' of git://git./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 '_'