From: Linus Torvalds Date: Sun, 8 Mar 2009 17:21:10 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=153d8a122e04d285aaee0ba00af7564182b7b6de;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: smack: fixes for unlabeled host support --- 153d8a122e04d285aaee0ba00af7564182b7b6de