| commit | 156a9ea43acb609ac89d48dbb9f0d05ee903a12e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:31:55 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:31:55 2008 -0700 |
| tree | 0b470e783c6f5012421a9a59aa8864c5fcc96407 | |
| parent | c8d10bffdbea5f82a8e491467a23fb2cc7da921b [diff] | |
| parent | ca05a99a54db1db5bca72eccb5866d2a86f8517f [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6: capabilities: remain source compatible with 32-bit raw legacy capability support. LSM: remove stale web site from MAINTAINERS