diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-15 22:34:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 22:34:48 -0500 |
| commit | 9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c (patch) | |
| tree | 0b4ad1c00078b335e49b5fcb460d02797c19a1ff /security/security.c | |
| parent | 173cc11a6e10c38ff7d4949b48e8d2eb0aee3e05 (diff) | |
| parent | d951d4cc84e8b5ddb8e0ab81cf6a72cc73fdd668 (diff) | |
Merge branch 'asus' into release
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/platform/x86/eeepc-laptop.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions