diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-05 17:09:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-05 17:09:10 -0400 |
| commit | 9f34073b4e54ad58541e0e2b4a87f4f6c1460e21 (patch) | |
| tree | a5422b696e60b3ec3b4138d16e305781408fed97 /security/capability.c | |
| parent | c946b3047205d7e107be16885bbb42ab9f10350a (diff) | |
| parent | 4afcddae4cc7d8bb36c1d47967d6ede29ea45e1a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend
[ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend
Diffstat (limited to 'security/capability.c')
0 files changed, 0 insertions, 0 deletions