diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 13:26:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-22 13:26:30 -0800 |
| commit | 683fdc5fe5fec5c4f27eb58a8781f212f50c8e01 (patch) | |
| tree | fde848a374c53ff4352e0f9166b4d4eca0582886 /security/capability.c | |
| parent | f7f84f38cd916552c175f1f3d09cb6e85c1b29fc (diff) | |
| parent | 0f99fed4606dcbcbe813df831a39fd8f9653ef54 (diff) | |
Merge branch 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
PM: Split up sysdev_[suspend|resume] from device_power_[down|up], fix
Diffstat (limited to 'security/capability.c')
0 files changed, 0 insertions, 0 deletions