diff options
| author | Len Brown <len.brown@intel.com> | 2011-08-02 17:22:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-02 17:22:09 -0400 |
| commit | 4a8f5058bde15d737abe39b5bed3f21dcb6599d2 (patch) | |
| tree | 5e4fc5e59d4393fd08852665a6da1ecbbfd0d8b3 /drivers/acpi/battery.c | |
| parent | 3eb208f0a36cf7a86953afa7a4eb6776294e6768 (diff) | |
| parent | eb03cb02b74df6dd0b653d5f6d976f16a434dfaf (diff) | |
| parent | d7f6169a0d32002657886fee561c641acddb9a75 (diff) | |
| parent | e4108292cc5b5ca07abc83af31a78338362810ca (diff) | |
| parent | bb0c5ed6ec523199e34e81dcef8e987507553b63 (diff) | |
| parent | aa165971c2923d05988f920c978e438dbc7b0de6 (diff) | |
| parent | 4996c02306a25def1d352ec8e8f48895bbc7dea9 (diff) | |
| parent | 6c8111e9a0e73ef1e58a1bf0a10c23ee1512e7a2 (diff) | |
| download | linux-4a8f5058bde15d737abe39b5bed3f21dcb6599d2.tar.gz | |
Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm', 'kexec-param' and 'misc' into release
Conflicts:
Documentation/kernel-parameters.txt
Signed-off-by: Len Brown <len.brown@intel.com>