diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 03:16:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-14 03:16:09 +0200 |
| commit | b21597d0268983f8f9e8b563494f75490403e948 (patch) | |
| tree | 3cbf8d08d85912c871d4f973b95069e6035ddd6f /drivers/dio/dio-sysfs.c | |
| parent | Fix quilt merge error in acpi-cpufreq.c (diff) | |
| parent | tomoyo: version bump to 2.2.0. (diff) | |
| download | linux-b21597d0268983f8f9e8b563494f75490403e948.tar.xz linux-b21597d0268983f8f9e8b563494f75490403e948.zip | |
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:
tomoyo: version bump to 2.2.0.
tomoyo: add Documentation/tomoyo.txt
Diffstat (limited to 'drivers/dio/dio-sysfs.c')
0 files changed, 0 insertions, 0 deletions