diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:48:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:48:46 -0400 |
| commit | 59b17bf6ea06abed519dfc788fff1b6b9499d23f (patch) | |
| tree | 6f7e870659f91e753dc515cc1b8702420dd6a81e /drivers/lguest | |
| parent | edd84690d15e4cb144cc60b754d4eaf8fac0a711 (diff) | |
| parent | 0f66af530116e9f4dd97f328d91718b56a6fc5a4 (diff) | |
Merge branch 'async-battery' into release
Conflicts:
drivers/acpi/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions