diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 10:55:57 -0700 |
| commit | a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287 (patch) | |
| tree | f031a4ae113e7669b56eb399c2e6f5285d2418f5 /include/linux | |
| parent | Merge git://git.infradead.org/battery-2.6 (diff) | |
| parent | SELinux: /proc/mounts should show what it can (diff) | |
Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
SELinux: /proc/mounts should show what it can
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions