diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-03-24 20:06:35 -0700 |
| commit | 6e997bb894beef128fcfe1679e0830f97dee6dc2 (patch) | |
| tree | 078d95af4d30b5e3d5b1db18de215489b26e01ce /kernel/audit.h | |
| parent | c6cc9fc9d42ec82da2c770f0bef1488dc467f29c (diff) | |
| parent | 92413a9bee1299cedcc0e5cfbfbc6b42496fb817 (diff) | |
| download | op-kernel-dev-6e997bb894beef128fcfe1679e0830f97dee6dc2.zip op-kernel-dev-6e997bb894beef128fcfe1679e0830f97dee6dc2.tar.gz | |
Merge branch 'urgent'
Conflicts:
drivers/power/pm2301_charger.c
Diffstat (limited to 'kernel/audit.h')
0 files changed, 0 insertions, 0 deletions
