| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf | [log] [tgz] |
|---|---|---|
| author | Len Brown <len.brown@intel.com> | Sun Aug 15 01:06:31 2010 -0400 |
| committer | Len Brown <len.brown@intel.com> | Sun Aug 15 01:06:31 2010 -0400 |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f [diff] | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 [diff] |
Merge branch 'linus' into release Conflicts: drivers/acpi/debug.c Signed-off-by: Len Brown <len.brown@intel.com>