From: Linus Torvalds Date: Wed, 25 May 2011 19:03:47 +0000 (-0700) Subject: Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek... X-Git-Tag: tegra-l4t-r15-er2~4877 X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=commitdiff_plain;h=62af8163f9caa5b21996338ccd2564dfd727670e 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 '_' --- 62af8163f9caa5b21996338ccd2564dfd727670e