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 /include/linux/root_dev.h | |
| parent | s3c-adc-battery: Fix possible NULL pointer dereference (diff) | |
| parent | pm2301_charger: Remove __dev* annotations (diff) | |
Merge branch 'urgent'
Conflicts:
drivers/power/pm2301_charger.c
Diffstat (limited to 'include/linux/root_dev.h')
0 files changed, 0 insertions, 0 deletions